From aab4bec314be1fa7e15c2d6a99d708d2f8996312 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 2 Jul 2012 21:53:03 +0200 Subject: ufoai: fixing the build. Building with libpng12. --- pkgs/games/ufoai/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 { }; -- cgit 1.4.1