summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/games/ufoai/default.nix3
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix
index 80f527e26e1..85440f88901 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/pkgs/games/ufoai/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   # for the xvidcore static lib
   NIX_CFLAGS_COMPILE = "-pthread -lm";
 
-  buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis
+  # Order is important, x libs include a libpng version that fails for ufoai
+  buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis
     libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext
     p7zip ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f316344a32b..a18dc54cfe7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7940,6 +7940,7 @@ let
 
   ufoai = callPackage ../games/ufoai {
     inherit (gnome) gtksourceview gtkglext;
+    libpng = libpng12;
   };
 
   ultimatestunts = callPackage ../games/ultimatestunts { };