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

haskell-gtk: clean up our existing overrides

Browse Source
This commit is contained in:
Peter Simons 2019-10-07 14:09:43 +02:00
parent 6ef33275b8
commit 6d95c7b595
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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: {

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -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;