Refactor Pharo to allow co-installation of VMs

This commit is contained in:
Damien Cassou
2016-01-18 20:14:19 +01:00
parent 351ae1bd24
commit d422861055
4 changed files with 72 additions and 44 deletions
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo } @args:
{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem } @args:
rec {
pharo-vm-build = import ./build-vm.nix args;
@@ -10,7 +10,7 @@ rec {
name = "pharo-vm-i386-${version}";
binary-basename = "pharo-vm";
src = fetchurl {
url = "$base-url/pharo-vm-${version}.tar.bz2";
url = "${base-url}/pharo-vm-${version}.tar.bz2";
sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
};
};
@@ -20,7 +20,7 @@ rec {
name = "pharo-vm-spur-i386-${version}";
binary-basename = "pharo-spur-vm";
src = fetchurl {
url = "$base-url/pharo-vm-spur-${version}.tar.bz2";
url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
sha256 = "1746kisa3wkhg1kwgjs544s3f17r8h99kr728qc4nk035dxkjfbx";
};
};