public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated freemind to 0.9.0_Beta_20, purified env sto make it work for everyone a

Browse Source 
svn path=/nixpkgs/trunk/; revision=12819
This commit is contained in:
Marc Weber 2008-09-07 21:17:49 +00:00
parent 958ea79a78
commit 1aea0c12a3
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/misc/freemind/default.nix
View File

@ -1,10 +1,10 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "freemind-0.9.0_Beta_13"; name = "freemind-0.9.0_Beta_20";
src = fetchurl { src = fetchurl {
url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz; url = mirror://sourceforge/freemind/freemind-src-0.9.0_Beta_20.tar.gz;
sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w"; sha256 = "1ja573n0g9zpdrljabgps20njg1p76hvsv8xjb56cii2dr77yspv";
}; };
buildInputs = [jdk ant]; buildInputs = [jdk ant];
@ -23,19 +23,23 @@ stdenv.mkDerivation {
# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103 # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
# JDK 7 beta seems to have fixed this (bug ?) # JDK 7 beta seems to have fixed this (bug ?)
installPhase=" installPhase=''
ensureDir \$out/{bin,nix-support} ensureDir $out/{bin,nix-support}
cp -r ../bin/dist \$out/nix-support cp -r ../bin/dist $out/nix-support
sed -i 's/which/type -p/' \$out/nix-support/dist/freemind.sh sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
cat > \$out/bin/freemind << EOF cat > $out/bin/freemind << EOF
#!/bin/sh #!/bin/sh
export LIBXCB_ALLOW_SLOPPY_LOCK=true # using pure env has removed the segfault for me :-)
export JAVA_HOME=\$jre exec env -i sh -c "
\$out/nix-support/dist/freemind.sh export PATH=\"${args.coreutils}/bin:${args.gnugrep}/bin\";
EOF 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} chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
"; '';
meta = { meta = {
description = "mind mapping software"; description = "mind mapping software";

2
pkgs/top-level/all-packages.nix
View File

@ -6201,7 +6201,7 @@ let
}; };
freemind = import ../applications/misc/freemind { freemind = import ../applications/misc/freemind {
inherit fetchurl stdenv ant; inherit fetchurl stdenv ant coreutils gnugrep;
jdk = jdk; jdk = jdk;
jre = jdk; jre = jdk;
}; };