diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-13 21:45:30 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-13 21:45:30 +0000 |
commit | bcc742adc194fe649197893322d1bf551eeb3911 (patch) | |
tree | 3c716fa09ddb26351f55b8e162254089bed0566f /pkgs/applications/misc/freemind | |
parent | 507f7fb86e5c4d1a7ec67680ac10b572fac2ae68 (diff) | |
download | nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar.gz nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar.bz2 nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar.lz nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar.xz nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.tar.zst nixpkgs-bcc742adc194fe649197893322d1bf551eeb3911.zip |
Changing the freemind wrapper, so it doesn't clear the environment at freemind running.
It did annoy loosing LANG, and XAUTH things, which use to work fine in other programs. I checked, and it works for me, seeing no segfault as it was written. svn path=/nixpkgs/trunk/; revision=17795
Diffstat (limited to 'pkgs/applications/misc/freemind')
-rw-r--r-- | pkgs/applications/misc/freemind/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 6981f187ece..525b65caa69 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { buildInputs = [jdk ant]; - inherit jre; - phases="unpackPhase buildPhase installPhase"; buildPhase="ant dist"; @@ -29,13 +27,10 @@ stdenv.mkDerivation { 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" + export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH" + 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} |