about summary refs log tree commit diff
path: root/pkgs/build-support/release
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/build-support/release')
-rw-r--r--pkgs/build-support/release/ant-build.nix6
-rw-r--r--pkgs/build-support/release/binary-tarball.nix4
-rw-r--r--pkgs/build-support/release/debian-build.nix4
-rw-r--r--pkgs/build-support/release/maven-build.nix4
-rw-r--r--pkgs/build-support/release/nix-build.nix4
-rw-r--r--pkgs/build-support/release/rpm-build.nix2
-rw-r--r--pkgs/build-support/release/source-tarball.nix4
7 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 2aa08ee27dec..fe15f93a8fe2 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (
     '';
 
     installPhase = ''
-      ensureDir $out/lib/java
+      mkdir -p $out/lib/java
       ${ if jars == [] then '' 
            find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java
          '' else stdenv.lib.concatMapStrings (j: ''
@@ -58,7 +58,7 @@ stdenv.mkDerivation (
       header "Generating jar wrappers"
     '' + (stdenv.lib.concatMapStrings (w: ''
 
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cat >> $out/bin/${w.name} <<EOF
       #! /bin/sh
       export JAVA_HOME=$jre
@@ -98,7 +98,7 @@ stdenv.mkDerivation (
     buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
 
     postHook = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
       # If `src' is the result of a call to `makeSourceTarball', then it
diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix
index f8bb5282ee2f..6901c9f5555f 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/pkgs/build-support/release/binary-tarball.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (
     name = name + (if src ? version then "-" + src.version else "");
   
     postHook = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
       # If `src' is the result of a call to `makeSourceTarball', then it
@@ -62,7 +62,7 @@ stdenv.mkDerivation (
 
     distPhase =
       ''
-        ensureDir $out/tarballs
+        mkdir -p $out/tarballs
         tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
       '';
 
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 070a54fc945c..8d2ea849a09f 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -30,7 +30,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
 
       # If `src' is the result of a call to `makeSourceTarball', then it
@@ -67,7 +67,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         --provides="${concatStringsSep "," debProvides}" \
         make install
 
-      ensureDir $out/debs
+      mkdir -p $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
 
       [ "$(echo $out/debs/*.deb)" != "" ]
diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 66dd10005f20..39f069cd57f0 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation ( rec {
   setupPhase = ''
     runHook preSetupPhase
 
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     export LANG="en_US.UTF-8"
     export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive
     export M2_REPO=$TMPDIR/repository
@@ -74,7 +74,7 @@ stdenv.mkDerivation ( rec {
   '';
 
   mvnRelease = ''
-    ensureDir $out/release
+    mkdir -p $out/release
 
     zip=$(ls target/*.zip| head -1)
     releaseName=$(basename $zip .zip)
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index a32f0e07a0cc..64d8b8f19247 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (
           if test -n "$keepBuildDirectory"; then
               KEEPBUILDDIR="$out/`basename $TMPDIR`"
               header "Copying build directory to $KEEPBUILDDIR"
-              ensureDir $KEEPBUILDDIR
+              mkdir -p $KEEPBUILDDIR
               cp -R $TMPDIR/* $KEEPBUILDDIR
               stopNest 
           fi
@@ -56,7 +56,7 @@ stdenv.mkDerivation (
     name = name + (if src ? version then "-" + src.version else "");
   
     postHook = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
       if test -z "${toString doCoverageAnalysis}"; then
diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 326ccbe9c428..26b120e5b1d0 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -14,7 +14,7 @@ vmTools.buildRPM (
     name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
 
     preBuild = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
 
       # If `src' is the result of a call to `makeSourceTarball', then it
diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index 0475cdf76b77..45a871567482 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (
           if test -n "$keepBuildDirectory"; then
               KEEPBUILDDIR="$out/`basename $TMPDIR`"
               header "Copying build directory to $KEEPBUILDDIR"
-              ensureDir $KEEPBUILDDIR
+              mkdir -p $KEEPBUILDDIR
               cp -R $TMPDIR/* $KEEPBUILDDIR
               stopNest
           fi
@@ -91,7 +91,7 @@ stdenv.mkDerivation (
     buildInputs = buildInputs ++ bootstrapBuildInputs;
     
     postHook = ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
     '';  
 
     postUnpack = ''