From bcc742adc194fe649197893322d1bf551eeb3911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Oct 2009 21:45:30 +0000 Subject: [PATCH] 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 --- pkgs/applications/misc/freemind/default.nix | 13 ++++--------- 1 file 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}