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/pharo | |
| parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/development/pharo')
| -rw-r--r-- | pkgs/development/pharo/vm/build-vm-legacy.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/pharo/vm/build-vm.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/pharo/vm/vms.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index bd84dd06e7f4..e76b1802c23f 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 47773c209545..5fc747cbc8c2 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -5,7 +5,7 @@ , glibc , openssl , libgit2 -, libGLU_combined +, libGLU, libGL , freetype , xorg , alsaLib @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { libs = [ cairo libgit2 - libGLU_combined + libGLU libGL freetype openssl libuuid @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { glibc openssl gcc48 - libGLU_combined + libGLU libGL freetype xorg.libX11 xorg.libICE diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 91cf01847090..080da830af69 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -7,7 +7,7 @@ , openssl , gcc , libgit2 -, libGLU_combined +, libGLU, libGL , freetype , xorg , alsaLib |