From e30848fbe89edd3f9d9bb366d3a8d5b7f37de319 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 10 Aug 2014 09:01:58 +0200 Subject: [PATCH 1/2] Move the slash to workaround bug Emacs nix-mode --- pkgs/development/pharo/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 939ff8ec750..d4f7a1f844a 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cp * "$prefix/lib/pharo-vm" - cp -R "$resources"/* "$prefix/" + cp -R "$resources/"* "$prefix/" mkdir $prefix/bin From 0efd7b00927ea917b56fb68492690e0bd2877f2b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 10 Aug 2014 09:51:02 +0200 Subject: [PATCH 2/2] Add meta-information to Pharo package --- pkgs/development/pharo/vm/default.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index d4f7a1f844a..bff8f45f2a1 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -76,4 +76,25 @@ stdenv.mkDerivation rec { patches = [ patches/pharo-is-not-squeak.patch patches/fix-executable-name.patch patches/fix-cmake-root-directory.patch ]; buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ]; + + meta = { + description = "Clean and innovative Smalltalk-inspired environment"; + longDescription = '' + Pharo's goal is to deliver a clean, innovative, free open-source + Smalltalk-inspired environment. By providing a stable and small core + system, excellent dev tools, and maintained releases, Pharo is an + attractive platform to build and deploy mission critical applications. + + This package provides the executable VM. You should probably not care + about this package (which represents a packaging detail) and have a + look at the pharo-vm-core package instead. + + Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu + packaging (ppa:pharo/stable)' project. + ''; + homepage = http://pharo.org; + license = stdenv.lib.licenses.mit; + maintainers = [ "Damien Cassou " ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; } \ No newline at end of file