From 4b263946dd77aed9ec118aafc85fbd678397afe2 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 9 Jul 2014 20:48:18 +0200
Subject: 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.
---
 pkgs/applications/graphics/graphicsmagick/1.3.7.nix | 2 +-
 pkgs/development/libraries/fox/default.nix          | 2 +-
 pkgs/development/libraries/qt-3/default.nix         | 2 +-
 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;
 
-- 
cgit 1.4.1