diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-10 16:44:34 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
commit | c9d8624ccddf17aee28745446b6763aabb26b4c7 (patch) | |
tree | e7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/applications/science/misc/root | |
parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
download | nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.gz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.bz2 nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.lz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.xz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.zst nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.zip |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/applications/science/misc/root')
-rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 2145d7e71d33..8422eb8752b1 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1 , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 690dc920d5c8..ada2f0b44adb 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; |