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/tdm/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/tdm/default.nix')
| -rw-r--r-- | pkgs/games/tdm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index f0a89adab572..fef3350a061d 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa -, xorg, libGLU_combined, openal +, xorg, libGLU, libGL, openal , lib, makeWrapper, makeDesktopItem }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { buildInputs = [ glibc_multi mesa.dev xorg.libX11.dev openal xorg.libXext.dev xorg.libXxf86vm.dev - libGLU_combined + libGL libGLU ]; unpackPhase = '' 7z x $src @@ -86,7 +86,7 @@ EOF ''; postInstall = '' - wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGLU_combined ]} + wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU ]} ''; enableParallelBuilding = true; |