diff options
author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
---|---|---|
committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/pharo/vm | |
parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/pharo/vm')
-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 b2e37344afc3..66cef77e5a94 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, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU_combined 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 b72b1851024a..82b3da7a37c4 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib # Create the script cat > "$out/bin/${cmd}" <<EOF @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { # # (stack protection is disabled above for gcc 4.8 compatibility.) nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; + buildInputs = [ bash unzip glibc openssl gcc48 libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 5258f4f6e77b..9a7a1ebd06f6 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -1,4 +1,4 @@ -{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: +{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: let pharo-vm-build = import ./build-vm.nix args; |