From af4d6b73dea1bf63dee2a06b9bde4f58594b3e20 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 22 May 2013 19:03:49 +0200 Subject: [PATCH 1/2] adding alchemy painting application --- .../applications/graphics/alchemy/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/graphics/alchemy/default.nix diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix new file mode 100644 index 00000000000..c8d53f35177 --- /dev/null +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation { + name = "alchemy-007-alpha"; + enableParallelBuilding = true; + + src = fetchurl { + url = http://al.chemy.org/files/Alchemy-007.tar.gz; + sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b"; + }; + + installPhase = '' + ensureDir $out/bin $out/share + cp -a . $out/share/alchemy + cat >> $out/bin/alchemy << EOF + #!/bin/sh + cd $out/share/alchemy + ${jre}/bin/java -jar Alchemy.jar "$@" + EOF + chmod +x $out/bin/alchemy + ''; + + meta = { + description = "Drawing application"; + homepage = http://al.chemy.org/; + license = stdenv.lib.licenses.gpl; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1a47b29e8..e17da967033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6692,6 +6692,8 @@ let aewan = callPackage ../applications/editors/aewan { }; + alchemy = callPackage ../applications/graphics/alchemy { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; From 67d41e44246a447baf0319db08975f5f7a5dcceb Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 30 May 2013 01:30:48 +0200 Subject: [PATCH 2/2] gpl fix --- pkgs/applications/graphics/alchemy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index c8d53f35177..2f31b568e34 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Drawing application"; homepage = http://al.chemy.org/; - license = stdenv.lib.licenses.gpl; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; };