diff options
| author | Peter Simons <simons@cryp.to> | 2019-10-07 14:09:43 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-10-07 20:51:00 +0200 |
| commit | 6d95c7b595ac61191211975e13f764329f7e73f9 (patch) | |
| tree | 4f53d1aca95fe5a715e6222266cd981e29228cbf /pkgs/development/haskell-modules | |
| parent | 6ef33275b8413b58a7f5f919689cf7cba4dfa1bd (diff) | |
| download | nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar.gz nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar.bz2 nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar.lz nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar.xz nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.tar.zst nixlib-6d95c7b595ac61191211975e13f764329f7e73f9.zip | |
haskell-gtk: clean up our existing overrides
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 53c71230f631..c89ac81d82eb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -691,9 +691,6 @@ self: super: { # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; - # Enable have-quartz-gtk flag on Darwin. - gtk = if pkgs.stdenv.isDarwin then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ad7c19170971..bcc7bb31386f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,7 +167,11 @@ self: super: builtins.intersectAttrs super { gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; - gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; + gtk = let gtk1 = addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools; + gtk2 = addPkgconfigDepend gtk1 pkgs.gtk2; + gtk3 = disableHardening gtk1 ["fortify"]; + gtk4 = if pkgs.stdenv.isDarwin then appendConfigureFlag gtk3 "-fhave-quartz-gtk" else gtk4; + in gtk3; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; |