diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 20:48:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 21:52:04 +0200 |
| commit | 4b263946dd77aed9ec118aafc85fbd678397afe2 (patch) | |
| tree | b8d4bdca206ffc65d77dd865923c3f99fe287e88 /pkgs | |
| parent | 9a009383343a440bd0f9cda8dfde6142c69d5026 (diff) | |
| download | nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar.gz nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar.bz2 nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar.lz nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar.xz nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.tar.zst nixpkgs-4b263946dd77aed9ec118aafc85fbd678397afe2.zip | |
qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones. Reordering is enough to ensure the older libpng gets picked.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/1.3.7.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/fox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/neverball/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix index 291d61d5f6f..8b780647dfa 100644 --- a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix +++ b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = "--enable-shared"; buildInputs = - [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 + [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2 zlib libtool ]; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 87e47e1b046..985322790a9 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "b5897e9c664967f5042e57070037ff18"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 9b5cb0452d6..432b4358f7a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng]; + propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 1ebb4b69b6e..2bec14a11c1 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga"; }; - buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs]; + buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs]; dontPatchElf = true; |