cabal2nix: map 'x11' pkg-config dependency to 'libX11', not 'xlibsWra…#589
Merged
sternenseemann merged 1 commit intoNixOS:masterfrom Dec 8, 2022
trofi:cabal2nix-without-xlibsWrapper
Merged
cabal2nix: map 'x11' pkg-config dependency to 'libX11', not 'xlibsWra…#589sternenseemann merged 1 commit intoNixOS:masterfrom trofi:cabal2nix-without-xlibsWrapper
sternenseemann merged 1 commit intoNixOS:masterfrom
trofi:cabal2nix-without-xlibsWrapper
Conversation
…pper' There are only 3 packages that use `xlibsWrapper` as a provider of `x11` `pkg-config` input. Thes are: `gi-xlib`, `greenclip`, `gtk-traymanager`. There should be no reason to use transitional `xlibsWrapper` package.
13 tasks
Member
|
Can you post the diff of regenerating hackage-packages.nix here with this patch applied? You do this by running |
Contributor
Author
|
Had to modify the command slightly: Here is the diff against --- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1,4 +1,4 @@
-/* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */
+/* hackage-packages.nix is auto-generated by hackage2nix -- DO NOT EDIT MANUALLY! */
{ pkgs, lib, callPackage }:
@@ -113358,8 +113358,8 @@ self: {
"gi-xlib" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
- , haskell-gi-base, haskell-gi-overloading, text, transformers
- , xlibsWrapper
+ , haskell-gi-base, haskell-gi-overloading, libX11, text
+ , transformers
}:
mkDerivation {
pname = "gi-xlib";
@@ -113370,10 +113370,10 @@ self: {
base bytestring containers haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
- libraryPkgconfigDepends = [ xlibsWrapper ];
+ libraryPkgconfigDepends = [ libX11 ];
description = "xlib bindings";
license = lib.licenses.lgpl21Only;
- }) {inherit (pkgs) xlibsWrapper;};
+ }) {inherit (pkgs.xorg) libX11;};
"giak" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, containers
@@ -120725,9 +120725,8 @@ self: {
"greenclip" = callPackage
({ mkDerivation, base, binary, bytestring, directory, exceptions
- , hashable, libXau, libXScrnSaver, microlens, microlens-mtl
+ , hashable, libX11, libXau, libXScrnSaver, microlens, microlens-mtl
, protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp
- , xlibsWrapper
}:
mkDerivation {
pname = "greenclip";
@@ -120740,13 +120739,13 @@ self: {
microlens-mtl protolude text tomland unix vector wordexp X11
];
executablePkgconfigDepends = [
- libXau libXScrnSaver xcb xdmcp xlibsWrapper
+ libX11 libXau libXScrnSaver xcb xdmcp
];
description = "Simple clipboard manager to be integrated with rofi";
license = lib.licenses.bsd3;
mainProgram = "greenclip";
- }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau;
- xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;};
+ }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
+ inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;};
"greg-client" = callPackage
({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -121974,16 +121973,16 @@ self: {
}) {};
"gtk-traymanager" = callPackage
- ({ mkDerivation, base, glib, gtk3, xlibsWrapper }:
+ ({ mkDerivation, base, glib, gtk3, libX11 }:
mkDerivation {
pname = "gtk-traymanager";
version = "1.0.1";
sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di";
libraryHaskellDepends = [ base glib gtk3 ];
- libraryPkgconfigDepends = [ xlibsWrapper ];
+ libraryPkgconfigDepends = [ libX11 ];
description = "A wrapper around the eggtraymanager library for Linux system trays";
license = lib.licenses.lgpl21Only;
- }) {inherit (pkgs) xlibsWrapper;};
+ }) {inherit (pkgs.xorg) libX11;};
"gtk2hs-buildtools" = callPackage
({ mkDerivation, alex, array, base, Cabal, containers, directory
@@ -312543,7 +312542,10 @@ self: {
description = "A tiling window manager";
license = lib.licenses.bsd3;
mainProgram = "xmonad";
- maintainers = [ lib.maintainers.peti ];
+ maintainers = [
+ lib.maintainers.dschrempf lib.maintainers.ivanbrennan
+ lib.maintainers.peti
+ ];
}) {};
"xmonad-bluetilebranch" = callPackage
@@ -312589,7 +312591,10 @@ self: {
];
description = "Community-maintained extensions for xmonad";
license = lib.licenses.bsd3;
- maintainers = [ lib.maintainers.peti ];
+ maintainers = [
+ lib.maintainers.dschrempf lib.maintainers.ivanbrennan
+ lib.maintainers.peti
+ ];
}) {};
"xmonad-contrib-bluetilebranch" = callPackage
|
Member
Right, that is a good reminder, I need to remember to add that bit back to the
great! |
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…pper'
There are only 3 packages that use
xlibsWrapperas a provider ofx11pkg-configinput. Thes are:gi-xlib,greenclip,gtk-traymanager.There should be no reason to use transitional
xlibsWrapperpackage.