diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:29:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:36:54 +0100 |
| commit | 7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e (patch) | |
| tree | addea6c250c34b29acb432fd2602b58922771868 /pkgs/games | |
| parent | 1743953cc5dee3ec78d1769ec5edff18a27607cb (diff) | |
| parent | 9ae72f2715d800f25f7dca0dec69624968d52909 (diff) | |
| download | nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.gz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.bz2 nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.lz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.xz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.zst nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.zip | |
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting after qt4 timing out for the first time: https://hydra.nixos.org/eval/1412641?compare=1412561
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/freedink/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/macopix/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/mudlet/default.nix | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 94451ef8930d..c1bfda9e2f2f 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -28,11 +28,18 @@ in stdenv.mkDerivation rec { pkgconfig intltool fontconfig libzip zip zlib ]; + preConfigure = '' + # Build fails on Linux with windres. + export ac_cv_prog_ac_ct_WINDRES= + ''; + postInstall = '' mkdir -p "$out/share/" ln -s ${freedink_data}/share/dink "$out/share/" ''; + enableParallelBuilding = true; + meta = { description = "A free, portable and enhanced version of the Dink Smallwood game engine"; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 72b0b0d00cdd..b490231442e3 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk openssl ]; + preConfigure = '' + # Build fails on Linux with windres. + export ac_cv_prog_WINDRES= + ''; + + enableParallelBuilding = true; + meta = { description = "Mascot Constructive Pilot for X"; homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 078075931dae..673efb0e118d 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -r mudlet-lua $out makeWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "\"${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}\"" \ + --set LUA_CPATH "${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}" \ --run "cd $out"; ''; |