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

treewide: explicitly specify gtk and related package versions

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-12 00:24:51 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ self: super: {
});
gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend (
addBuildTool super.gtk self.gtk2hs-buildtools
) pkgs.gtk) (drv: {
) pkgs.gtk2) (drv: {
hardeningDisable = [ "fortify" ];
});
gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };

2
pkgs/development/haskell-modules/default.nix
View File

@@ -49,7 +49,7 @@ let
overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
};
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope;
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;

2
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -129344,7 +129344,7 @@ self: {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Pango text rendering engine";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs.gnome) pango;};
}) {inherit (pkgs.gnome2) pango;};
"papa" = callPackage
({ mkDerivation, base, directory, doctest, filepath, papa-base