diff options
author | Luke Gorrie <luke@snabb.co> | 2017-06-30 07:50:06 +0000 |
---|---|---|
committer | Luke Gorrie <luke@snabb.co> | 2017-06-30 07:50:06 +0000 |
commit | d55f8276ae4417b13c600ae86be1dff7ca0142cd (patch) | |
tree | ecce6896c2df384acb9c7f66230e84769e28714c /pkgs/development | |
parent | 4ed1d53cbecccebe0ebe654b8847943e93ffd493 (diff) |
pharo: Update build-vm.nix for latest upstream
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/pharo/vm/build-vm.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 2f2db1293c728..2f2e125ea39e5 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Regenerate the configure script. # Unnecessary? But the build breaks without this. autoreconfPhase = '' - pushd opensmalltalk-vm/platforms/unix/config + pushd platforms/unix/config make popd ''; @@ -46,19 +46,18 @@ stdenv.mkDerivation rec { # VM sources require some patching before build. prePatch = '' - patchShebangs opensmalltalk-vm/build.${flavor} + patchShebangs build.${flavor} # Fix hard-coded path to /bin/rm in a script - sed -i -e 's:/bin/rm:rm:' opensmalltalk-vm/platforms/unix/config/mkmf + sed -i -e 's:/bin/rm:rm:' platforms/unix/config/mkmf # Fill in mandatory metadata about the VM source version sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \ -e 's!\$Rev\$!$Rev: ${version} $!' \ -e 's!\$URL\$!$URL: ${source-url} $!' \ - opensmalltalk-vm/platforms/Cross/vm/sqSCCSVersion.h + platforms/Cross/vm/sqSCCSVersion.h ''; # Note: --with-vmcfg configure option is broken so copy plugin specs to ./ preConfigure = '' - cd opensmalltalk-vm cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} . ''; |