about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2016-10-03 15:14:16 +0200
committerGitHub <noreply@github.com>2016-10-03 15:14:16 +0200
commit4c39fe5d6631bcb98526e440ddc66f7c13b8f256 (patch)
tree2bd24068694a86835590929f4e026edbd911b27f /pkgs/games
parente4958d54b13909281ee01ef241abab5d955f6f75 (diff)
downloadnixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar.gz
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar.bz2
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar.lz
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar.xz
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.tar.zst
nixlib-4c39fe5d6631bcb98526e440ddc66f7c13b8f256.zip
xonotic: fix dependencies (#19173)
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/xonotic/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index e45bbb20d3a7..fc42b299e918 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -22,27 +22,18 @@ stdenv.mkDerivation rec {
     libX11 mesa libXpm libXext libXxf86vm alsaLib
     # sdl
     SDL
+    zlib libvorbis curl
   ];
 
   sourceRoot = "Xonotic/source/darkplaces";
 
-  #patchPhase = ''
-  #  substituteInPlace glquake.h \
-  #    --replace 'typedef char GLchar;' '/*typedef char GLchar;*/'
-  #'';
-
-  NIX_LDFLAGS = ''
-    -rpath ${zlib.out}/lib
-    -rpath ${libvorbis.out}/lib
-    -rpath ${curl.out}/lib
-  '';
-
   buildPhase = ''
     DP_FS_BASEDIR="$out/share/xonotic"
     make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
     make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
     make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
   '';
+  enableParallelBuilding = true;
 
   installPhase = ''
     mkdir -p "$out/bin"