summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/jedit
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-18 20:16:00 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-18 20:16:00 +0000
commitc556a6ea46e71e1907d78b71fab36df30297b3ad (patch)
tree91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/applications/editors/jedit
parentf7159c195a623c311829c38c40ef010ac6e943f7 (diff)
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
Diffstat (limited to 'pkgs/applications/editors/jedit')
-rw-r--r--pkgs/applications/editors/jedit/default.nix14
-rw-r--r--pkgs/applications/editors/jedit/wrapper.nix2
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 5349f10c0c36..194f13a090cd 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -17,19 +17,19 @@ stdenv.mkDerivation {
'';
installPhase = ''
- ensureDir $out/share/jEdit
+ mkdir -p $out/share/jEdit
cp build/jedit.jar $out/share/jEdit
- ensureDir $out/share/jEdit/modes
+ mkdir -p $out/share/jEdit/modes
cp -r modes/* $out/share/jEdit/modes
- ensureDir $out/share/jEdit/icons
+ mkdir -p $out/share/jEdit/icons
cp -r icons/* $out/share/jEdit/icons
- ensureDir $out/share/jEdit/macros
+ mkdir -p $out/share/jEdit/macros
cp -r macros/* $out/share/jEdit/macros
- ensureDir $out/share/jEdit/doc
+ mkdir -p $out/share/jEdit/doc
cp -r doc/* $out/share/jEdit/doc
sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
- ensureDir $out/share/applications
+ mkdir -p $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
patch package-files/linux/jedit << EOF
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
- ensureDir $out/bin
+ mkdir -p $out/bin
cp package-files/linux/jedit $out/bin/jedit
chmod +x $out/bin/jedit
'';
diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix
index 8af3d96918d8..1126a7278d6c 100644
--- a/pkgs/applications/editors/jedit/wrapper.nix
+++ b/pkgs/applications/editors/jedit/wrapper.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
phases = "buildPhase";
buildPhase = "
-ensureDir \$out/bin
+mkdir -p \$out/bin
cat > \$out/bin/${jedit.name} << EOF
#!/bin/sh
exec $java -jar $jeditjar \\$*