diff options
author | Marc Weber <marco-oweber@gmx.de> | 2008-09-07 21:17:49 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2008-09-07 21:17:49 +0000 |
commit | 1aea0c12a36e3180cad076d7580b9d388ed386de (patch) | |
tree | 6c95e7fd00ea0ee622d09e094237ab749c3cd707 | |
parent | 958ea79a787354d46b72e5c1d5657ddf8dd5f9fd (diff) |
updated freemind to 0.9.0_Beta_20, purified env sto make it work for everyone a
svn path=/nixpkgs/trunk/; revision=12819
-rw-r--r-- | pkgs/applications/misc/freemind/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 21 insertions, 17 deletions
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index de96e5a27fa1d..6981f187ece22 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "freemind-0.9.0_Beta_13"; + name = "freemind-0.9.0_Beta_20"; src = fetchurl { - url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz; - sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w"; + url = mirror://sourceforge/freemind/freemind-src-0.9.0_Beta_20.tar.gz; + sha256 = "1ja573n0g9zpdrljabgps20njg1p76hvsv8xjb56cii2dr77yspv"; }; buildInputs = [jdk ant]; @@ -23,19 +23,23 @@ stdenv.mkDerivation { # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103 # JDK 7 beta seems to have fixed this (bug ?) - installPhase=" - ensureDir \$out/{bin,nix-support} - cp -r ../bin/dist \$out/nix-support - sed -i 's/which/type -p/' \$out/nix-support/dist/freemind.sh - cat > \$out/bin/freemind << EOF -#!/bin/sh -export LIBXCB_ALLOW_SLOPPY_LOCK=true -export JAVA_HOME=\$jre -\$out/nix-support/dist/freemind.sh -EOF - - chmod +x \$out/{bin/freemind,nix-support/dist/freemind.sh} - "; + installPhase='' + ensureDir $out/{bin,nix-support} + cp -r ../bin/dist $out/nix-support + sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh + cat > $out/bin/freemind << EOF + #!/bin/sh + # using pure env has removed the segfault for me :-) + exec env -i sh -c " + export PATH=\"${args.coreutils}/bin:${args.gnugrep}/bin\"; + export DISPLAY=\"\$DISPLAY\"; + export JAVA_HOME=\"$jre\"; + export LIBXCB_ALLOW_SLOPPY_LOCK=true; + $out/nix-support/dist/freemind.sh" + EOF + + chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh} + ''; meta = { description = "mind mapping software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d43378fa8552..1b427499dadcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6201,7 +6201,7 @@ let }; freemind = import ../applications/misc/freemind { - inherit fetchurl stdenv ant; + inherit fetchurl stdenv ant coreutils gnugrep; jdk = jdk; jre = jdk; }; |