diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-15 11:54:04 +0300 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-15 11:54:04 +0300 |
commit | 9a550b1364b4a662749d6f6a52df0b9395fda9c8 (patch) | |
tree | 60814d42b6c9066e5a4b60c1e44926a63f2c6767 /pkgs/development/haskell-modules/configuration-nix.nix | |
parent | 0f09cfb9c76bb8bcfa6e11e0dbf4c06da3608ccf (diff) |
haskellPackages: drop util-linux on darwin
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c7c7c64a46ffe..7a2c2d56809bf 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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 [] ) ); |