diff options
author | Balletie <skip_meesie@hotmail.com> | 2017-05-10 21:15:20 +0200 |
---|---|---|
committer | Balletie <skip_meesie@hotmail.com> | 2017-06-30 14:07:46 +0200 |
commit | 96600d57704536a3de652ea30814e047aa6a8ba5 (patch) | |
tree | a6e2b1039c3c4584c91c4e35861de76f0764d09a /pkgs/development/pharo | |
parent | d55f8276ae4417b13c600ae86be1dff7ca0142cd (diff) |
pharo-vm: Add third-party libraries to LD_LIBRARY_PATH of legacy VM
This commit adds the third party libraries needed by the default Pharo environment to the LD_LIBRARY_PATH, by using makeWrapper.
Diffstat (limited to 'pkgs/development/pharo')
-rw-r--r-- | pkgs/development/pharo/vm/build-vm-legacy.nix | 10 | ||||
-rw-r--r-- | pkgs/development/pharo/vm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/pharo/vm/vms.nix | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index 111b985bdb37f..b2e37344afc33 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, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { cd build/ ''; resources = ./resources; + installPhase = '' mkdir -p "$prefix/lib/$name" @@ -40,10 +41,15 @@ stdenv.mkDerivation rec { chmod +x $prefix/bin/pharo-cog + # Add cairo library to the library path. + wrapProgram $prefix/bin/pharo-cog --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} + ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa 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 ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 6d84981e7addf..e6269503a4c4f 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, callPackage_i686, ...} @pkgs: +{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs: let i686 = callPackage_i686 ./vms.nix {}; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 15e8c3ef06e9b..bd1bddc69e96d 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, gcc6, fetchFromGitHub } @args: +{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, fetchFromGitHub, makeWrapper} @args: let pharo-vm-build = import ./build-vm.nix args; |