diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
commit | c556a6ea46e71e1907d78b71fab36df30297b3ad (patch) | |
tree | 91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/tools | |
parent | f7159c195a623c311829c38c40ef010ac6e943f7 (diff) | |
download | nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.gz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.bz2 nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.lz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.xz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.zst nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.zip |
* "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')
100 files changed, 129 insertions, 129 deletions
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index a3d21ab1800..adc04b62944 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 abe5c9b59d6..5d68e1da1ba 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 0691521e44c..cf7692cc58a 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 diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 72fced37728..10590bbfcf1 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -31,13 +31,13 @@ buildPhase() { } installPhase() { - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 ./vncinstall $out/bin $out/share/man # fix HTTP client: t=$out/share/tightvnc - ensureDir $t + mkdir -p $t sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver cp -r classes $t } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 7a15514a728..0852674e8c8 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin sed -i -e s,/usr/local/bin,$out/bin, Makefile ''; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 20d5ae7715e..b1fd5a10c2b 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unetbootin $out/bin - ensureDir $out/share/unetbootin + mkdir -p $out/share/unetbootin cp unetbootin_*.qm $out/share/unetbootin - ensureDir $out/share/applications + mkdir -p $out/share/applications cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh index 1acb10cb794..f2792a40a60 100644 --- a/pkgs/tools/compression/bsdiff/builder.sh +++ b/pkgs/tools/compression/bsdiff/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup installFlags="PREFIX=$out INSTALL=install" -ensureDir "$out/bin" -ensureDir "$out/man/man1" +mkdir -p "$out/bin" +mkdir -p "$out/man/man1" genericBuild diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index ea2ebc4c2db..4610bdd4085 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -8,7 +8,7 @@ if test -n "$sharedLibrary"; then } preInstall() { - ensureDir $out/lib + mkdir -p $out/lib mv libbz2.so* $out/lib ln -s libbz2.so.1.0 $out/lib/libbz2.so } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c3fd01d5c88..f3b8037a9f1 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { cd src "; - installPhase = "ensureDir $out/bin ; cp upx.out $out/bin/upx"; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { homepage = http://upx.sourceforge.net/; diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh index 376c0bf4f39..03db413181d 100644 --- a/pkgs/tools/compression/zdelta/builder.sh +++ b/pkgs/tools/compression/zdelta/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p zdc zdu $out/bin } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 622424c302f..0e72c45e31a 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/etc $out/var/lib + mkdir -p $out/etc $out/var/lib makeFlags="$makeFlags prefix=$out" ''; diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index d6d5c3a48aa..4ddab385a42 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 ''; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index afa4be345a9..717b08acc5f 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ]; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v httpfs2 "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" cp -v *.1 "$out/share/man/man1" ''; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 606914cd976..fcb3c23ed1d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib fuse ]; postInstall = '' - ensureDir $out/sbin + mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 435305f1e2a..26df8818b2b 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -16,10 +16,10 @@ rec { phaseNames = ["doMake" "copyFiles"]; copyFiles = a.fullDepEntry '' - ensureDir $out/bin + mkdir -p $out/bin cp cfdg $out/bin/ - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} cp *.txt $out/share/doc/${name} '' ["defEnsureDir" "doMake"]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 232b6c5464a..13f7d4b7f6f 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -22,7 +22,7 @@ rec { libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; doCmake = a.fullDepEntry('' - ensureDir $PWD/builddir + mkdir -p $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 8ee02710b05..959241d30ab 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin set +e sh install set -e diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 32048db4154..531e17b92cb 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin $out/man/man1 + mkdir -p $out/bin $out/man/man1 ''; meta = { diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 02db33f92cb..ed29b743d54 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { "; installPhase = " - ensureDir $out/bin + mkdir -p $out/bin cp glxinfo glxgears $out/bin/ "; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 2d98a1efdce..c497d60aef9 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 1fc14445bbd..fd26174f197 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp pdfread.py $out/bin chmod +x $out/bin/pdfread.py LIBSUFFIX=lib/${python.libPrefix}/site-packages/ PYDIR=$out/$LIBSUFFIX - ensureDir $PYDIR + mkdir -p $PYDIR cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh index 89d4e3b98ea..2fb16b259bd 100644 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ b/pkgs/tools/graphics/ploticus/builder.sh @@ -5,12 +5,12 @@ preBuild() { } preInstall() { - ensureDir $out/bin + mkdir -p $out/bin } postInstall() { # Install the "prefabs". - ensureDir $out/share/ploticus/prefabs && \ + mkdir -p $out/share/ploticus/prefabs && \ cd .. && \ cp -rv prefabs/* $out/share/ploticus/prefabs diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index 16c91720964..edd0a96c689 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -34,7 +34,7 @@ rec { cd .. '' ["doMake"]; createDirs = fullDepEntry '' - ensureDir $out/bin $out/lib $out/include $out/share + mkdir -p $out/bin $out/lib $out/include $out/share '' ["defEnsureDir"]; name = "libdecodeqr-" + version; diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh index f128c4ce364..c466f759446 100644 --- a/pkgs/tools/graphics/transfig/builder.sh +++ b/pkgs/tools/graphics/transfig/builder.sh @@ -31,8 +31,8 @@ buildPhase() { } preInstall() { - ensureDir $out - ensureDir $out/lib + mkdir -p $out + mkdir -p $out/lib } genericBuild diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 0076b2a4a86..d02b38b4127 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ rec { doDeploy = a.simplyShare "welkin"; createBin = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/welkin" echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin" echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin" diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ac3aa5a6b1e..397e80a745e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -21,10 +21,10 @@ let version = "4"; in buildInputs = [ python ]; installPhase = '' - ensureDir "$out/bin" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share/man/man1" yes no | sh ./install.sh - ensureDir "$out/etc/bash_completion.d" + mkdir -p "$out/etc/bash_completion.d" cp -v autojump.bash "$out/etc/bash_completion.d" echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'" diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 53027246b7f..33a1fc839ce 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' cp -r . $out; cd $out t=bin/debootstrap - ensureDir bin man/man8 + mkdir -p bin man/man8 cat >> $t << EOF #!/bin/sh export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap @@ -66,7 +66,7 @@ stdenv.mkDerivation { /* build from source: installPhase = '' cp ${devices} devices.tar.gz - ensureDir $out/{bin,man/man8}; + mkdir -p $out/{bin,man/man8}; cp debootstrap.8 $out/man/man8 sed -i \ -e 's@-o root@@' \ diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 72e368e709e..b9a15ac6a20 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [zlib bzip2 openssl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dmg2img $out/bin ''; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index d203419cd69..7ceecc3690a 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dtach $out/bin/dtach ''; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 9f0892bb0aa..a32e5abbb29 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -32,5 +32,5 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; }; - postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib"; + postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; } diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 04a0662a3b6..2de9efdac58 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; # workaround: otherwise make install fails (should be fixed in trunk) - preInstall = "ensureDir $out/bin $out/man/man1"; + preInstall = "mkdir -p $out/bin $out/man/man1"; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 00265d1f31d..3f89713918f 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; preConfigure = '' - ensureDir $out/{man/man6,bin} + mkdir -p $out/{man/man6,bin} makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 202d28684d0..7db9324c281 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configurePhase = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp $db $out/nix-support/hddtemp.db ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index aa4ba13963c..1e73b674c15 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -2,11 +2,11 @@ source $stdenv/setup unzip $src -ensureDir $out/jars +mkdir -p $out/jars mv */*.jar $out/jars jar=$(ls $out/jars/jdiskreport-*.jar) -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/jdiskreport <<EOF #! $SHELL -e exec $jdk/bin/java -jar $jar diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index b664e9d92b6..db2d6cffc40 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; unpackPhase = '' - ensureDir src + mkdir -p src pushd src tar xvzf $src ''; @@ -22,8 +22,8 @@ stdenv.mkDerivation { ''; buildPhase = "make -f makefile linux"; installPhase = '' - ensureDir $out/bin - ensureDir $out/man/man1 + mkdir -p $out/bin + mkdir -p $out/man/man1 make -f makefile install ''; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 1e744afdf40..633d08e4c66 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I."; installPhase = '' - ensureDir $out + mkdir -p $out cp memtest.bin $out/ ''; diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix index 8c5eb24af48..62d4ee2579f 100644 --- a/pkgs/tools/misc/myhasktags/default.nix +++ b/pkgs/tools/misc/myhasktags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; phases="buildPhase"; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin ghc --make $src -o $out/bin/hasktags-modified ''; buildInputs = [ ghcPlain ]; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index e3a9e7b87c3..37636da7235 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { makeFlags = [ "LIBUSB=${libusb}" "linux" ]; installPhase = '' - ensureDir $out/bin $out/share/pk2 + mkdir -p $out/bin $out/share/pk2 cp pk2cmd $out/bin cp PK2DeviceFile.dat $out/share/pk2 wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index b6c69be2f09..a3a34d95fb5 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patchPhase = '' cd src substituteInPlace config --replace /bin/bash /bin/sh - ensureDir $out + mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" ''; meta = { diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index d2fa91d3fe8..4f271bcd623 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp RockboxUtility $out/bin ''; diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix index 082b04b95d7..68f20df0577 100644 --- a/pkgs/tools/misc/shebangfix/default.nix +++ b/pkgs/tools/misc/shebangfix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { phases = "buildPhase"; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin s=$out/bin/shebangfix cp $file $s chmod +wx $s diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index c112afaee0f..2deb8893f4e 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { preConfigure = '' find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@' - ensureDir $out + mkdir -p $out sed -e 's/chown/true/' \ -e 's/chgrp/true/' \ -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \ diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index e4e8d3c3e9b..3f05d600944 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ]; preInstall = '' - ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin" + mkdir -p $out; makeFlags="DESTDIR=$out BINDIR=/bin" ''; buildInputs = [freetype fontconfig libunwind libtool flex bison]; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 46a841113a1..5692aecebbf 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [openssl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp vfdecrypt $out/bin ''; } diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index 93231397feb..5cfe8737638 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { -e '/untar/d' \ build.xml ant - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} JAR=$out/lib/css-validator.jar cat >> $out/bin/css-validator << EOF #!/bin/sh diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index cb2631bd5d8..74ee8b5b548 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -32,7 +32,7 @@ rec { phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; prepareDirs = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a98f307c77d..8335b0eb8db 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -31,7 +31,7 @@ rec { phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" - ensureDir "$out/bin" + mkdir -p "$out/bin" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index fc29af989ce..808c738110e 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index f5865020785..cd3ae12a11b 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { buildInputs = [ which ]; installPhase = '' - ensureDir $out/bin; cp cntlm $out/bin/; - ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; - ensureDir $out/man/; cp doc/cntlm.1 $out/man/; + mkdir -p $out/bin; cp cntlm $out/bin/; + mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; + mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; meta = { diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 7c1e89083b8..e57ba489450 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -15,7 +15,7 @@ buildPerlPackage { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ddclient $out/bin ''; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index cdab68f22ea..c9e1b58d2d2 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libpcap ncurses ]; preInstall = '' - ensureDir $out/share/man/man8 $out/bin + mkdir -p $out/share/man/man8 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index c55688d5060..8649eda4bf7 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' prefix=$out/eggdrop - ensureDir $prefix + mkdir -p $prefix ''; postConfigure = '' diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c3ac4e205ae..cbc07522019 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp flvstreamer $out/bin cp streams $out/bin cp rtmpsrv $out/bin diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 9383b857a3a..c74dbe52829 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -11,8 +11,8 @@ let version = "20000331"; in preConfigure = '' makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" ''; installTargets = "install man"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 1039cadb3ee..34ec8eed90e 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man3 + mkdir -p $out/share/man/man3 cp man3/miniupnpc.3 $out/share/man/man3/ ''; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 5d62222d141..6db47f8e079 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp miniupnpd.1 $out/share/man/man1/ ''; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index a834ffc3739..684507a1d2e 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -37,7 +37,7 @@ rec { '' ["doUnpack" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp netboot "$out/bin" '' ["defEnsureDir" "minInit"]; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index adf85a981d1..6b9763972df 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = " - ensureDir $out/man/man{1,8} $out/sbin $out/bin + mkdir -p $out/man/man{1,8} $out/sbin $out/bin "; meta = { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 69243b4f68e..7cadf8a1345 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --with-privsep-path=$out/empty" - ensureDir $out/empty + mkdir -p $out/empty ''; postInstall = @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/ssh-copy-id cp contrib/ssh-copy-id.1 $out/share/man/man1/ - ensureDir $out/etc/ssh + mkdir -p $out/etc/ssh cp moduli $out/etc/ssh/ ''; diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh index 13b7a483192..9d41dba2e43 100644 --- a/pkgs/tools/networking/p2p/azureus/builder.sh +++ b/pkgs/tools/networking/p2p/azureus/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/azureus.jar -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/azureus <<EOF #! $SHELL -e azureusHome=$out diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 4056c6429b0..ae52865eace 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 ''; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b48600a9f99..5ef4a640d2a 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,7 +66,7 @@ buildPythonPackage { # something writable doesn't help; providing $FONTCONFIG_FILE doesn't # help either. So we just don't run `make' under `docs/'. - ensureDir "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 8ade37976b6..7457a72b5d5 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -32,7 +32,7 @@ rec { installProgram = a.fullDepEntry('' mv "$out/share/philter/".*rc "$out/share/philter/philterrc" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp "$out/share/philter/src/philter.py" "$out/bin/philter" chmod a+x "$out/bin/philter" '') ["addInputs" "copyToShare" "minInit"]; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 895b2c4be4f..07196b77d0a 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -30,7 +30,7 @@ rec { phaseNames = ["fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" - ensureDir "$out/bin" "$out/man/man1" + mkdir -p "$out/bin" "$out/man/man1" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 8a704bb5711..5079b951a64 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -32,7 +32,7 @@ rec { '') ["minInit" "doUnpack"]; makeDirs = a.fullDepEntry('' - ensureDir $out/share/${name}/etc/ppp + mkdir -p $out/share/${name}/etc/ppp '') ["minInit" "defEnsureDir"]; name = "rp-pppoe-" + version; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8ed71c34523..48788d36884 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/libexec/s3sync + mkdir -p $out/libexec/s3sync cp *.rb $out/libexec/s3sync makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync - ensureDir $out/share/doc/s3sync + mkdir -p $out/share/doc/s3sync cp README* $out/share/doc/s3sync/ ''; # */ diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index bb588f36599..ebbfcb5d360 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,etc} + mkdir -p "$out/"{bin,lib,share/man,etc} '' ["defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 38b7c27b6fd..9006fadfcdb 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/slimrat $out/bin + mkdir -p $out/share/slimrat $out/bin cp -R src/* $out/share/slimrat # slimrat-gui does not work (it needs the Gtk2 perl package) for i in slimrat; do diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 65a1d241c0b..795c0cfc8cc 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/{bin,man/man8,man/man1} + mkdir -p $out/{bin,man/man8,man/man1} cp client $out/bin/stun cp server $out/bin/stund cp debian/manpages/stund.8 $out/man/man8 diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 4cb47fada06..007efa42827 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -v default.sdf "$out/share/${name}" sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix index dd2082d30b2..062977b455c 100644 --- a/pkgs/tools/networking/tcng/default.nix +++ b/pkgs/tools/networking/tcng/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { # manually copy tcc and include files.. see comment above installPhase = '' - ensureDir $out{,/sbin,/lib/tcng/include} + mkdir -p $out{,/sbin,/lib/tcng/include} make DESTDIR=$out install cp tcc/tcc $out/sbin cp tcc/*.tc $out/lib/tcng/include diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 7d72016cfe2..8c8c0241204 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include cp c-client/*.h c-client/linkage.c $out/include cp c-client/c-client.a $out/lib/libc-client.a cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 6cc18ec8678..837ab3627fa 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/man/man1 $out/bin + mkdir -p $out/man/man1 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 19f30713a9f..9c1f8c8dd39 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' python setup.py install --prefix=$out - ensureDir $out/share/other + mkdir -p $out/share/other cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 0a830e75d80..3200d27c004 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -26,7 +26,7 @@ rec { cd bmrsa unzip ${src} sed -e 's/gcc/g++/' -i Makefile - ensureDir $out/bin + mkdir -p $out/bin echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index e7545ac8cd6..73f7f8c9ae5 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; installPhase = " - ensureDir $out/sbin + mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin "; diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index 94bc009080d..e02ce1316ba 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -9,8 +9,8 @@ rec { configureFlags = []; doInstall = fullDepEntry('' - ensureDir $out/share/msf - ensureDir $out/bin + mkdir -p $out/share/msf + mkdir -p $out/bin cp -r * $out/share/msf diff --git a/pkgs/tools/security/opensc-dnie-wrapper/default.nix b/pkgs/tools/security/opensc-dnie-wrapper/default.nix index ec649790e67..b36d99f8ebf 100644 --- a/pkgs/tools/security/opensc-dnie-wrapper/default.nix +++ b/pkgs/tools/security/opensc-dnie-wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/etc + mkdir -p $out/etc cp ${opensc}/etc/opensc.conf $out/etc chmod +w $out/etc/opensc.conf diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index d5462a1120a..3ca41032815 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v pius "$out/bin" - ensureDir "$out/doc/pius-${version}" + mkdir -p "$out/doc/pius-${version}" cp -v README "$out/doc/pius-${version}" ''; diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix index 0a1452e5355..33a77c07844 100644 --- a/pkgs/tools/security/seccure/0.4.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e s@/usr/@$out/@g -i Makefile sed -e 's@ln -f@ln -sf@g' -i Makefile - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 ''; meta = { diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 3816df415c6..74682d00d03 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -e s@/usr/@$out/@g -i Makefile cp ssss.manpage.xml ssss.1 cp ssss.manpage.xml ssss.1.html - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile ''; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 24a1558e901..bb3f9d72e82 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/sbin $out/etc + mkdir -p $out/sbin $out/etc cp script/bootchartd $out/sbin cp script/bootchartd.conf $out/etc chmod +x $out/sbin/bootchartd diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 17583f612dc..6132abc0879 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h ''; - preInstall = "ensureDir $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; + preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { description = "Vixie Cron, a daemon for running commands at specific times"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index b018de88f46..57f9a1a57d5 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -40,7 +40,7 @@ rec { fixPaths = a.doPatchShebangs ''$out/bin''; install_dd_rhelp = a.fullDepEntry ('' - ensureDir "$out/share/dd_rescue" "$out/bin" + mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 35c510f625c..f82c94c0a72 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 install -v -m755 gdisk sgdisk fixparts $out/sbin install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \ $out/share/man/man8 diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index f33dc7227fb..bf5e6eeffa5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -40,7 +40,7 @@ popd # Installation export PLAN9=$out -ensureDir $PLAN9 +mkdir -p $PLAN9 GLOBIGNORE='src:.*' cp -R * $PLAN9 GLOBIGNORE= diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 02654cd8922..05494e54a3e 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp clit $out/bin ''; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 3beb47b0696..1485bbcd467 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -21,7 +21,7 @@ rec { installFlags = "PREFIX=$out"; doDeploy = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin cp dadadodo $out/bin '') [ "minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index d033cf4ba6f..7c76c7f1bca 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 perl ]; configurePhase = '' - ensureDir $out/{bin,man/man1} + mkdir -p $out/{bin,man/man1} makeFlags="PREFIX=$out" ''; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 01e58146ed8..72dbdbf647f 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; }; - preInstall = "ensureDir \$out/share/man"; + preInstall = "mkdir -p \$out/share/man"; postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; patches = [./malloc.patch]; diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh index 0a7cdc5b8a8..d9cc8849276 100644 --- a/pkgs/tools/text/xml/jing/script-builder.sh +++ b/pkgs/tools/text/xml/jing/script-builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat >> $out/bin/jing <<EOF #! $SHELL diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index 3ec035c105e..ee66cf92377 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp rxp $out/bin ''; meta = { diff --git a/pkgs/tools/text/xml/trang/builder.sh b/pkgs/tools/text/xml/trang/builder.sh index 9ae7f7bfe92..9fe712360ba 100644 --- a/pkgs/tools/text/xml/trang/builder.sh +++ b/pkgs/tools/text/xml/trang/builder.sh @@ -1,10 +1,10 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars unzip -j $src '*/trang.jar' cp -p *.jar $out/jars -ensureDir $out/bin +mkdir -p $out/bin cat >> $out/bin/trang <<EOF #! $SHELL diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 31c57850285..a4b9d375bce 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i -e "s,/etc/vim,,g" Makefile.in ''; - preInstall = "ensureDir $out/etc/vim"; + preInstall = "mkdir -p $out/etc/vim"; buildInputs = [ python ]; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 68c09f86e11..5a2c5fb2e06 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 pushd doc make halibut.1 popd diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 61e1dfb9d87..a78feaadb18 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { extraBuildInputs = [regexCompat texLive]; postInstall = '' - ensureDir "$out/share/doc/$name" + mkdir -p "$out/share/doc/$name" cp doc/Guide2.pdf $out/share/doc/$name - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" ''; meta = { diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh index a710bc12023..9fcb80f6866 100644 --- a/pkgs/tools/typesetting/pdfjam/builder.sh +++ b/pkgs/tools/typesetting/pdfjam/builder.sh @@ -2,8 +2,8 @@ source $stdenv/setup tar zxvf $src -ensureDir $out/bin +mkdir -p $out/bin cp pdfjam/scripts/* $out/bin -ensureDir $out/man/man1 +mkdir -p $out/man/man1 cp pdfjam/man1/* $out/man/man1 diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 3a6c934928d..28a43e69598 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preBuild = "cd pdftk"; installPhase = '' - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 cp pdftk $out/bin cp ../debian/pdftk.1 $out/share/man/man1 ''; diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index f6f32a7c5b7..d582609478b 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out mv * $out rm $out/*.txt diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index d79afe7e90f..73b65a7e0fc 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out mv * $out rm $out/bin/*.cmd # Windows stuff |