diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-21 11:40:16 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-21 11:40:16 +0000 |
| commit | 1eed9435d55fbe12b36f58a924f9448f727ca8ab (patch) | |
| tree | f81b69effc6ed7aadfbe9b9f86b1f052566429f1 /pkgs/development/haskell-modules | |
| parent | 0102e6970720c2f24ad495ba0416b28975450804 (diff) | |
| download | nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar.gz nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar.bz2 nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar.lz nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar.xz nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.tar.zst nixpkgs-1eed9435d55fbe12b36f58a924f9448f727ca8ab.zip | |
haskellPackages.glib: simplify
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f6eae83a20c..eca1343e513 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -244,9 +244,9 @@ self: super: { gio_0_13_0_3 = addPkgconfigDepend super.gio_0_13_0_3 pkgs.glib; gio_0_13_0_4 = addPkgconfigDepend super.gio_0_13_0_4 pkgs.glib; gio_0_13_1_0 = addPkgconfigDepend super.gio_0_13_1_0 pkgs.glib; - glib = addPkgconfigDepend (overrideCabal super.glib (drv: { + glib = pkgs.lib.overrideDerivation (addPkgconfigDepend super.glib pkgs.glib) (drv: { hardening_fortify = false; - })) pkgs.glib; + }); gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; gtk = addPkgconfigDepend super.gtk pkgs.gtk; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; |