From c556a6ea46e71e1907d78b71fab36df30297b3ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jan 2012 20:16:00 +0000
Subject: * "ensureDir" -> "mkdir -p".  "ensureDir" is a rather pointless  
 function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
---
 pkgs/misc/screensavers/electricsheep/default.nix | 2 +-
 pkgs/misc/screensavers/rss-glx/builder.sh        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/misc/screensavers')

diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 64674d78ac77..dca60f55af03 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   preInstall = ''
     installFlags=GNOME_DATADIR=$out
-    ensureDir $out/control-center/screensavers
+    mkdir -p $out/control-center/screensavers
   '';
 
   meta = {
diff --git a/pkgs/misc/screensavers/rss-glx/builder.sh b/pkgs/misc/screensavers/rss-glx/builder.sh
index 00ec2e065bd2..a0c138d5e047 100644
--- a/pkgs/misc/screensavers/rss-glx/builder.sh
+++ b/pkgs/misc/screensavers/rss-glx/builder.sh
@@ -2,9 +2,9 @@ source $stdenv/setup
 
 # This is a very dirty hack to prevent the binaries from putting the
 # Mesa libraries in their RPATHs.
-ensureDir $out/tmp
+mkdir -p $out/tmp
 ln -s $mesa/lib/* $out/tmp/
-ensureDir $out/lib
+mkdir -p $out/lib
 ln -s $mesa/lib/libGLU* $out/lib/
 export NIX_LDFLAGS="-L$out/tmp $NIX_LDFLAGS"
 
@@ -14,7 +14,7 @@ rm -rf $out/tmp
 
 
 # Add a wrapper around each program to use the appropriate OpenGL driver.
-ensureDir $out/bin/.orig
+mkdir -p $out/bin/.orig
 
 for i in $(cd $out/bin && ls); do
     mv $out/bin/$i $out/bin/.orig/$i
-- 
cgit 1.4.1