mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-13 16:07:30 +03:00
haskellPackages: drop util-linux on darwin
This commit is contained in:
parent
0f09cfb9c7
commit
9a550b1364
@ -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 [] )
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user