colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #237883 from wegank/util-linux-drop

Browse Source 
haskellPackages: drop util-linux on darwin
This commit is contained in:
Weijia Wang 2023-06-15 14:18:39 +03:00 committed by GitHub
commit 572d29fdc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 gio = lib.pipe super.gio
[ (disableHardening ["fortify"]) [ (disableHardening ["fortify"])
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
(addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux pcre ] (addPkgconfigDepends (with pkgs; [ glib pcre2 pcre ]
++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else []))) ++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
]; ];
glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib));
gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; });
gtk = lib.pipe super.gtk ( gtk = lib.pipe super.gtk (
[ (disableHardening ["fortify"]) [ (disableHardening ["fortify"])
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) (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 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 [] ) ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] )
); );