about summary refs log tree commit diff
path: root/pkgs/tools/X11
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/tools/X11
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/tools/X11')
-rw-r--r--pkgs/tools/X11/x2vnc/default.nix2
-rw-r--r--pkgs/tools/X11/x2x/default.nix4
-rw-r--r--pkgs/tools/X11/xpra/default.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index a3d21ab1800e9..adc04b629444a 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       xorg.libXrandr xorg.randrproto
     ];
 
-  preInstall = "ensureDir $out";
+  preInstall = "mkdir -p $out";
 
   meta = {
     homepahe = http://fredrik.hubbe.net/x2vnc.html;
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index abe5c9b59d600..5d68e1da1ba9c 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
-    ensureDir $out/man/man1
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
     cp x2x $out/bin/
     cp x2x.1 $out/man/man1/
   '';
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 0691521e44cf4..cf7692cc58acc 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -r install/* $out
 
     for i in $(cd $out/bin && ls); do