diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:16:15 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:17:36 +0100 |
| commit | 77b6c3cd06a679140fb5a44f81f904497007f333 (patch) | |
| tree | e8ed1606b326cdafba719cc2a14c527c1b601f2e /pkgs/games/dhewm3/default.nix | |
| parent | 602bccd1a8262d4e6bd787838d21fc3c2c1c50ba (diff) | |
| parent | 4d2dd1554618831f0a5b159b8a4dff86612c02a9 (diff) | |
| download | nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar.gz nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar.bz2 nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar.lz nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar.xz nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.tar.zst nixlib-77b6c3cd06a679140fb5a44f81f904497007f333.zip | |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/games/dhewm3/default.nix')
| -rw-r--r-- | pkgs/games/dhewm3/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 441e9f66981c..fd9729376403 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU_combined, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wsabvh1x4g12xmhzs2m2pgri2q9sir1w3m2r7fpy6kzxp32hqdk"; }; - # Add libGLU_combined linking + # Add libGLU libGL linking patchPhase = '' sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 libGLU_combined zlib libjpeg libogg libvorbis openal curl ]; + buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; enableParallelBuilding = true; |