From c9d8624ccddf17aee28745446b6763aabb26b4c7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 10 Nov 2019 16:44:34 +0000 Subject: treewide: Get rid of libGLU_combined --- pkgs/games/newtonwars/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/games/newtonwars/default.nix') diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index a0ae03cefb7..093f071c723 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: +{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU, libGL }: stdenv.mkDerivation { pname = "newtonwars"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut libGLU_combined ]; + buildInputs = [ makeWrapper freeglut libGL libGLU ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -26,7 +26,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/nw \ --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ - --prefix LD_LIBRARY_PATH ":" ${libGLU_combined}/lib + --prefix LD_LIBRARY_PATH ":" ${libGLU}/lib \ + --prefix LD_LIBRARY_PATH ":" ${libGL}/lib ''; meta = with stdenv.lib; { -- cgit 1.4.1