diff options
author | Luke Gorrie <luke@snabb.co> | 2017-04-17 17:00:23 +0000 |
---|---|---|
committer | Luke Gorrie <luke@snabb.co> | 2017-06-28 09:26:59 +0000 |
commit | fdb90f6df720b44f0475e42657a2f6c09797b42a (patch) | |
tree | 54dbaf8e1348b4443e21795e024f7245b57d50b8 /pkgs/development/pharo/launcher | |
parent | 71e495e10f363c91475f82683e6df3b49a5b3e7c (diff) | |
download | nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar.gz nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar.bz2 nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar.lz nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar.xz nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.tar.zst nixpkgs-fdb90f6df720b44f0475e42657a2f6c09797b42a.zip |
pharo: 5.0 -> 6.0
Create a new set of VM packages to keep up with changes in the upstream Pharo project.
Diffstat (limited to 'pkgs/development/pharo/launcher')
-rw-r--r-- | pkgs/development/pharo/launcher/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 911680b1eb8..a54a6671d7f 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }: +{ stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }: stdenv.mkDerivation rec { - version = "0.2.9-2016.01.14"; + version = "2017.02.28"; name = "pharo-launcher-${version}"; src = fetchurl { - url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip"; - sha256 = "0lzdnaw7l1rrzbrq53xsy38aiz6id5x7s78ds1dhb31vqc241yy8"; + url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; + sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; }; executable-name = "pharo-launcher"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # because upstream tarball has no top-level directory. sourceRoot = "."; - buildInputs = [ bash pharo-vm unzip ]; + buildInputs = [ bash pharo unzip ]; installPhase = '' mkdir -p $prefix/share/pharo-launcher @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { cat > $prefix/bin/${executable-name} <<EOF #!${bash}/bin/bash - - exec ${pharo-vm}/bin/pharo-vm-x $prefix/share/pharo-launcher/pharo-launcher.image + exec ${pharo}/bin/pharo $prefix/share/pharo-launcher/pharo-launcher.image EOF chmod +x $prefix/bin/${executable-name} ''; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { secs=5 echo -n "Running headless Pharo for $secs seconds to check for a crash... " timeout $secs \ - ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true' + ${pharo}/bin/pharo -nodisplay PharoLauncher.image --no-quit eval 'true' test "$?" == 124 && echo "ok") ''; @@ -78,7 +77,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; - platforms = pharo-vm.meta.platforms; + maintainers = [ ]; + platforms = pharo.meta.platforms; }; } |