alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Setting the difference buildInputs/buildNativeInputs in some gtk related packages.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
This commit is contained in:
Lluís Batlle i Rossell 2010-01-22 18:49:16 +00:00
parent fedf79faea
commit d47aead668
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/atk/1.24.x.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803"; sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803";
}; };
buildInputs = [pkgconfig perl]; buildNativeInputs = [perl];
buildInputs = [pkgconfig];
propagatedBuildInputs = [glib]; propagatedBuildInputs = [glib];
meta = { meta = {

3
pkgs/development/libraries/glib/2.20.x.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav"; sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav";
}; };
buildInputs = [pkgconfig gettext perl]; buildNativeInputs = [perl];
buildInputs = [pkgconfig gettext];
# The nbd package depends on a static version of this library; hence # The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off. # the default configure flag --disable-static is switched off.

3
pkgs/development/libraries/gtk+/2.16.x.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3"; sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3";
}; };
buildInputs = [ pkgconfig perl jasper ]; buildNativeInputs = [ perl ];
buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs = [ propagatedBuildInputs = [
x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr

3
pkgs/development/libraries/gtk+/2.18.x.nix
View file

@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan"; sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
}; };
buildInputs = [ pkgconfig perl jasper ]; buildNativeInputs = [ perl ];
buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs = propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]

5
pkgs/servers/x11/xorg/overrides.nix
View file

@ -42,6 +42,11 @@ in
buildNativeInputs = [ args.python ]; buildNativeInputs = [ args.python ];
}; };
pixman = attrs : attrs // {
buildInputs = [ args.pkgconfig ];
buildNativeInputs = [ args.perl ];
};
libX11 = attrs: attrs // { libX11 = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };