mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
This commit is contained in:
parent
fedf79faea
commit
d47aead668
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig perl];
|
||||
buildNativeInputs = [perl];
|
||||
buildInputs = [pkgconfig];
|
||||
propagatedBuildInputs = [glib];
|
||||
|
||||
meta = {
|
||||
|
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig gettext perl];
|
||||
buildNativeInputs = [perl];
|
||||
buildInputs = [pkgconfig gettext];
|
||||
|
||||
# The nbd package depends on a static version of this library; hence
|
||||
# the default configure flag --disable-static is switched off.
|
||||
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig perl jasper ];
|
||||
buildNativeInputs = [ perl ];
|
||||
buildInputs = [ pkgconfig jasper ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
|
||||
|
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig perl jasper ];
|
||||
buildNativeInputs = [ perl ];
|
||||
buildInputs = [ pkgconfig jasper ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
|
||||
|
@ -42,6 +42,11 @@ in
|
||||
buildNativeInputs = [ args.python ];
|
||||
};
|
||||
|
||||
pixman = attrs : attrs // {
|
||||
buildInputs = [ args.pkgconfig ];
|
||||
buildNativeInputs = [ args.perl ];
|
||||
};
|
||||
|
||||
libX11 = attrs: attrs // {
|
||||
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user