diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2012-07-02 21:53:03 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-07-02 21:53:03 +0200 |
commit | aab4bec314be1fa7e15c2d6a99d708d2f8996312 (patch) | |
tree | b712152f9777c790c62ed014c0b211f24fc89e2a | |
parent | bda2b3ca5a6cab6ea9a02fbcea77cb5e84c390c0 (diff) | |
download | nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar.gz nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar.bz2 nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar.lz nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar.xz nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.tar.zst nixpkgs-aab4bec314be1fa7e15c2d6a99d708d2f8996312.zip |
ufoai: fixing the build. Building with libpng12.
-rw-r--r-- | pkgs/games/ufoai/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
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 { }; |