public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liquidwar: fix build (#47064)

Browse Source 
- add missing dependencies readline and libtool that used to be
  propagated by guile but aren't anymore
- build with guile 2.0 instead of 1.8
This commit is contained in:
xeji 2018-09-21 00:19:01 +02:00 committed by GitHub
parent 9c02914b42
commit 2c5ae2ae61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/games/liquidwar/default.nix
View File

@ -2,7 +2,7 @@
, gmp, libGLU_combined, libjpeg, libpng , gmp, libGLU_combined, libjpeg, libpng
, expat, gettext, perl, guile , expat, gettext, perl, guile
, SDL, SDL_image, SDL_mixer, SDL_ttf , SDL, SDL_image, SDL_mixer, SDL_ttf
, curl, sqlite , curl, sqlite, libtool, readline
, libogg, libvorbis, libcaca, csound, cunit } : , libogg, libvorbis, libcaca, csound, cunit } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
curl sqlite curl sqlite
libogg libvorbis csound libogg libvorbis csound
libXrender libcaca cunit libXrender libcaca cunit
libtool readline
]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

2
pkgs/top-level/all-packages.nix
View File

@ -20030,7 +20030,7 @@ with pkgs;
}; };
liquidwar = callPackage ../games/liquidwar { liquidwar = callPackage ../games/liquidwar {
guile = guile_1_8; guile = guile_2_0;
}; };
liquidwar5 = callPackage ../games/liquidwar/5.nix { liquidwar5 = callPackage ../games/liquidwar/5.nix {