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/development/libraries/ogre | |
parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
download | nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.gz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.bz2 nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.lz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.xz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.zst nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.zip |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/ogre')
-rw-r--r-- | pkgs/development/libraries/ogre/1.10.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/ogre/1.9.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/ogre/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index d847f447048..b66759524fa 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 2855d1139c3..ced01580185 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index dc3bf8cf009..235da872392 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig |