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

qt3, graphicsmagick137, fox, neverball: fix build

Browse Source 
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
This commit is contained in:
Vladimír Čunát 2014-07-09 20:48:18 +02:00
parent 9a00938334
commit 4b263946dd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/graphicsmagick/1.3.7.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared"; configureFlags = "--enable-shared";
buildInputs = buildInputs =
[ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2
zlib libtool zlib libtool
]; ];

2
pkgs/development/libraries/fox/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
md5 = "b5897e9c664967f5042e57070037ff18"; md5 = "b5897e9c664967f5042e57070037ff18";
}; };
buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
doCheck = true; doCheck = true;

2
pkgs/development/libraries/qt-3/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ which ]; nativeBuildInputs = [ which ];
propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng]; propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];
configureFlags = " configureFlags = "
-v -v

2
pkgs/games/neverball/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga"; sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga";
}; };
buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs]; buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs];
dontPatchElf = true; dontPatchElf = true;