pharo: Update build-vm.nix for latest upstream
This commit is contained in:
parent
4ed1d53cbe
commit
d55f8276ae
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
# Regenerate the configure script.
|
# Regenerate the configure script.
|
||||||
# Unnecessary? But the build breaks without this.
|
# Unnecessary? But the build breaks without this.
|
||||||
autoreconfPhase = ''
|
autoreconfPhase = ''
|
||||||
pushd opensmalltalk-vm/platforms/unix/config
|
pushd platforms/unix/config
|
||||||
make
|
make
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
@ -46,19 +46,18 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# VM sources require some patching before build.
|
# VM sources require some patching before build.
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
patchShebangs opensmalltalk-vm/build.${flavor}
|
patchShebangs build.${flavor}
|
||||||
# Fix hard-coded path to /bin/rm in a script
|
# 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
|
# Fill in mandatory metadata about the VM source version
|
||||||
sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \
|
sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \
|
||||||
-e 's!\$Rev\$!$Rev: ${version} $!' \
|
-e 's!\$Rev\$!$Rev: ${version} $!' \
|
||||||
-e 's!\$URL\$!$URL: ${source-url} $!' \
|
-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 ./
|
# Note: --with-vmcfg configure option is broken so copy plugin specs to ./
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cd opensmalltalk-vm
|
|
||||||
cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} .
|
cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user