chore: convert xscrnsaver to xlibs.libXScrnSaver

[teto]

No description provided.

[teto]

following up on NixOS/nixpkgs#124593

[peti]

The "xlibs." prefix should be unnecessary.

[teto]

done. I couldn't find an easy way to test (this repo weirdly doesnt provide a shell.nix/flake.nix to check one's changes, the regenerate scripts fail because they ask for a nixpkgs). Hope that's good.

[sternenseemann]

Shouldn't it be xorg.libXScrnSaver? top level libXScrnSaver is not a thing.

[teto]

which is why I had used xlibs.libXScrnSaver (nix-build -A xlibs.libXScrnSaver works fine here). I've checked the box for maintainers to edit since you know better how cabal2nix does the mapping.

[sternenseemann]

xlibs is a deprecated alias for xorg, so we should use the latter definitely.

[teto]

I've just noticed that in the line below my change Xss references libXScrnSaver directly so maybe that 's why @peti made his comment ? looking at hackage-packages.nix it seems cabal2nix is smart enough to do inherit (pkgs.xorg) libXScrnSaver; so I think @peti may be right.

[sternenseemann]

Yeah distribution-nixpkgs does that, I should know that.

…

On 27. May 2021, at 23:50, Matthieu Coudron ***@***.***> wrote:  I've just noticed that in the line below my change Xss references libXScrnSaver directly so maybe that 's why @peti made his comment ? looking at hackage-packages.nix it seems cabal2nix is smart enough to do inherit (pkgs.xorg) libXScrnSaver; so I think @peti may be right. — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or unsubscribe.

[cdepillabout]

@teto Thanks for taking the time to put this together.

I tried regenerating hackage-packages.nix with this change and it appears to working:

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ec260563848..ccdef5fd12b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -110881,9 +110881,9 @@ self: {
 
   "greenclip" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, exceptions
-     , hashable, libXau, microlens, microlens-mtl, protolude, text
-     , tomland, unix, vector, wordexp, X11, xcb, xdmcp, xlibsWrapper
-     , xscrnsaver
+     , hashable, libXau, libXScrnSaver, microlens, microlens-mtl
+     , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp
+     , xlibsWrapper
      }:
      mkDerivation {
        pname = "greenclip";
@@ -110896,14 +110896,14 @@ self: {
          microlens-mtl protolude text tomland unix vector wordexp X11
        ];
        executablePkgconfigDepends = [
-         libXau xcb xdmcp xlibsWrapper xscrnsaver
+         libXau libXScrnSaver xcb xdmcp xlibsWrapper
        ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
-         inherit (pkgs) xlibsWrapper; xscrnsaver = null;};
+     }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau; 
+         xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;};
 
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network

greenclip now successfully builds.

[teto]

thanks for the guidance !