diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index b59be96bb62..c67e5a9489b 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,19 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv +, fetchurl +, bash +, unzip +, glibc +, openssl +, libgit2 +, libGLU_combined +, freetype +, xorg +, alsaLib +, cairo +, libuuid +, autoreconfHook +, gcc48 +, ... }: { name, src, version, source-date, source-url, ... }: @@ -65,7 +80,19 @@ stdenv.mkDerivation rec { # (No special build phase.) - installPhase = '' + installPhase = let + libs = [ + cairo + libgit2 + libGLU_combined + freetype + openssl + libuuid + alsaLib + xorg.libICE + xorg.libSM + ]; + in '' # Install in working directory and then copy make install-squeak install-plugins prefix=$(pwd)/products @@ -83,7 +110,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:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs} # Create the script cat > "$out/bin/${cmd}" <