cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages: drop util-linux on darwin

Browse source
This commit is contained in:
Weijia Wang 2023-06-15 11:54:04 +03:00
parent 0f09cfb9c7
commit 9a550b1364
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -322,18 +322,18 @@ self: super: builtins.intersectAttrs super {
gio = lib.pipe super.gio
[ (disableHardening ["fortify"])
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
(addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux pcre ]
++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else [])))
(addPkgconfigDepends (with pkgs; [ glib pcre2 pcre ]
++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
];
glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib));
gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; });
gtk = lib.pipe super.gtk (
[ (disableHardening ["fortify"])
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
(addPkgconfigDepends (with pkgs; [ gtk2 pcre2 util-linux pcre fribidi
(addPkgconfigDepends (with pkgs; [ gtk2 pcre2 pcre fribidi
libthai libdatrie xorg.libXdmcp libdeflate
]
++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else [])))
++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
] ++
( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] )
);