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/os-specific/linux | |
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/os-specific/linux')
57 files changed, 90 insertions, 90 deletions
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 48ab97d9106..cfb71690ad5 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq"; }; buildPhase = "rm *.o 915resolution; make"; - installPhase = "ensureDir $out/sbin; cp 915resolution $out/sbin/"; + installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; } diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 1a9b3cbf74d..925e2e2e650 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { installPhase = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp acpi_call.ko $out/lib/modules/$kernelVersion/misc - ensureDir $out/bin + mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 1fd6234b48e..b05093d8915 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -136,7 +136,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" { # install - ensureDir $out/lib/xorg + mkdir -p $out/lib/xorg cp -r common/usr/include $out cp -r common/usr/sbin $out @@ -152,7 +152,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc - ensureDir $t + mkdir -p $t cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t @@ -174,7 +174,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" } { # build samples - ensureDir $out/bin + mkdir -p $out/bin mkdir -p samples cd samples diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix index f6a3a6dffc2..1539775a2a1 100644 --- a/pkgs/os-specific/linux/aufs/2.1.nix +++ b/pkgs/os-specific/linux/aufs/2.1.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp -v aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2.1-util requires them. diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix index 696ed57b860..4d80ddae0b8 100644 --- a/pkgs/os-specific/linux/aufs/2.nix +++ b/pkgs/os-specific/linux/aufs/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2-util requires them. diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index ec3c5aec85b..731098134b5 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc # Install the headers because aufs3-util requires them. - ensureDir $out/include/linux + mkdir -p $out/include/linux cp -v usr/include/linux/aufs_type.h $out/include/linux ''; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9749b1568e4..39cc2dd4080 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { '' binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" docDir="$out/share/doc/broadcom-sta/" - ensureDir "$binDir" "$docDir" + mkdir -p "$binDir" "$docDir" cp wl.ko "$binDir" cp lib/LICENSE.txt "$docDir" ''; diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/pkgs/os-specific/linux/cramfsswap/builder.sh index 14e6a11f9d0..51a5b11dda6 100644 --- a/pkgs/os-specific/linux/cramfsswap/builder.sh +++ b/pkgs/os-specific/linux/cramfsswap/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup export DESTDIR=$out -ensureDir $out/usr/bin +mkdir -p $out/usr/bin genericBuild diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index da5e00e3377..a7fb22f95e9 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { #checkPhase = "make test" installPhase = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp kernel/*.ko "$out/share/${name}" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp src/{gexmap,exmtool,elftool,showproc} "$out/bin" ''; diff --git a/pkgs/os-specific/linux/ext3cow-tools/builder.sh b/pkgs/os-specific/linux/ext3cow-tools/builder.sh index 560b8d6723a..be6e3d9ce3a 100755 --- a/pkgs/os-specific/linux/ext3cow-tools/builder.sh +++ b/pkgs/os-specific/linux/ext3cow-tools/builder.sh @@ -13,7 +13,7 @@ sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h # make -ensureDir $out/bin/ +mkdir -p $out/bin/ cp ss $out/bin/snapshot cp tt $out/bin/ cp e2d $out/bin/ diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6ad2227ee69..f468b183be9 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { patchPhase = "rm -rf debian defines TODO"; - installPhase = "ensureDir $out && cp -ra * $out/"; + installPhase = "mkdir -p $out && cp -ra * $out/"; # repeat the same trick for radeon, 3com, etc. postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix index 2ffa8c3e837..3548a841aab 100644 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index ed6a82e0df7..402636862ec 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix index c09bd5c5aca..2660c0b2493 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix index 389d416f2a5..afe2357995c 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out; chmod -x *; cp * $out"; + installPhase = "mkdir -p $out; chmod -x *; cp * $out"; meta = { description = "Firmware for the Intel 3945ABG wireless card"; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index b75eae6acf2..3e3ad74adb3 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix index 0948d381f7f..e1771c7a5cf 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix index 8dc69e0a6a3..b8ee5f388d1 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix index 0505a940d26..0d409bd8427 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix index 5b7e2dc7b5e..e5f3effa4b7 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix index 80aa6d367be..e5fe73ca498 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix index 580af83ea9d..b3a2a810bf7 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix index 23513d2bf88..abf12fd672b 100644 --- a/pkgs/os-specific/linux/firmware/ralink/default.nix +++ b/pkgs/os-specific/linux/firmware/ralink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/*.bin $out cp $src/LICENSE $out/ralink.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix index 0c8accd2f6c..0a1cb655572 100644 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2860/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/rt2860.bin $out cp $src/LICENSE $out/rt2860.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix index 388d3a50343..15de7c30586 100644 --- a/pkgs/os-specific/linux/firmware/rt2870/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2870/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT2870 wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix index 32c097a62df..95393100139 100644 --- a/pkgs/os-specific/linux/firmware/rt73/default.nix +++ b/pkgs/os-specific/linux/firmware/rt73/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT73 wireless card"; diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 85bbb27c67f..7016e23581b 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = firmwareLinuxNonfree; phases = [ "installPhase" ]; - installPhase = "ensureDir $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; + installPhase = "mkdir -p $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; meta = { description = "Firmware for the Realtek RTL8192c wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index dfc384b7adb..a717bd9e117 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out/zd1211; cp * $out/zd1211"; + installPhase = "mkdir -p $out/zd1211; cp * $out/zd1211"; meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 455c11cb0a9..d21cdd78daf 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 - ensureDir $out/share/usb + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 + mkdir -p $out/share/usb ''; meta = { diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix index c179801ca55..32daf5633f7 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/include + mkdir -p $out/include cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ $out/include ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index 98a06556a19..920ccf9363d 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix index a4e86658193..a7ec522b3d6 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index c0f949186c6..f5fec3d8620 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 61cb8f28081..5d6d48d2fc3 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -48,7 +48,7 @@ configurePhase() { installPhase() { - ensureDir $out + mkdir -p $out # New kernel versions have a combined tree for i386 and x86_64. archDir=$arch @@ -60,7 +60,7 @@ installPhase() { # Copy the bzImage and System.map. cp System.map $out if test "$arch" = um; then - ensureDir $out/bin + mkdir -p $out/bin cp linux $out/bin elif test "$kernelTarget" != "vmlinux"; then # In any case we copy the 'vmlinux' ELF in the next lines diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index ff72d1f72b8..066b4fcb4e0 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { #name = "${klibc.name}-shrunk"; name = "${klibc.name}"; buildCommand = '' - ensureDir $out/lib + mkdir -p $out/lib cp -prd ${klibc}/lib/klibc/bin $out/ cp -p ${klibc}/lib/*.so $out/lib/ chmod +w $out/* diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh index 744d1d516a3..002bac8a1db 100644 --- a/pkgs/os-specific/linux/kudzu/builder.sh +++ b/pkgs/os-specific/linux/kudzu/builder.sh @@ -3,10 +3,10 @@ source $stdenv/setup export DESTDIR=$out preInstall() { - ensureDir $out - ensureDir $out/etc - ensureDir $out/sbin - ensureDir $out/usr + mkdir -p $out + mkdir -p $out/etc + mkdir -p $out/sbin + mkdir -p $out/usr make install-program } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index d8cb393ac38..c279393d7a4 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru = { postinst = n : '' - ensureDir $out/share/doc/${n} + mkdir -p $out/share/doc/${n} cp ../License $out/share/doc/${n}/License ''; }; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 09cd4ab037c..700455d5f8b 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preBuild = '' - ensureDir $out/bin + mkdir -p $out/bin substituteInPlace Makefile --replace /usr/bin $out/bin substituteInPlace lsiutil.c \ --replace /sbin/modprobe modprobe \ diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index b27baa5480b..192e2c7ac5f 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; preInstall = '' - ensureDir $out/sbin $out/share/man/man8 + mkdir -p $out/sbin $out/share/man/man8 makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 34de5108164..7c8b526b4c3 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '/usr$(libdir)' $TMPDIR \ --replace 'install-data-local:' 'install-data-local-disabled:' - ensureDir $out/etc + mkdir -p $out/etc ''; buildInputs = [openldap]; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index f329db90cb2..b9240805865 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preInstall = '' # The `install' rule expects this directory to be available. - ensureDir "$out/share/man/man5" + mkdir -p "$out/share/man/man5" ''; meta = { diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh index 6941288b390..e0af21759c9 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh @@ -36,7 +36,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so @@ -59,11 +59,11 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -72,7 +72,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 180eb84e5e4..b0d2bf35c52 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -27,7 +27,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/ ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so @@ -50,15 +50,15 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - ensureDir $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/drivers cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - ensureDir $out/lib/xorg/modules/extensions + mkdir -p $out/lib/xorg/modules/extensions cp -p libglx.so.* $out/lib/xorg/modules/extensions ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -67,7 +67,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp $i $out/bin/$i @@ -76,16 +76,16 @@ installPhase() { done # Header files etc. - ensureDir $out/include/nvidia + mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp -p *.1.gz $out/share/man/man1 - ensureDir $out/share/applications + mkdir -p $out/share/applications cp -p *.desktop $out/share/applications - ensureDir $out/share/pixmaps + mkdir -p $out/share/pixmaps cp -p nvidia-settings.png $out/share/pixmaps # Patch the `nvidia-settings.desktop' file. diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 7ab20855bd3..cd21899e60e 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/lib +mkdir -p $out/lib ln -s /usr/lib/libGL.so.1 $out/lib/ ln -s /usr/lib/libGLU.so.1 $out/lib/ diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh index 8bb282cacf7..21a2ac725ca 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh @@ -13,6 +13,6 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh index c189c2e1706..636b19a95af 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index a8b885d8a94..b53c61c754a 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lib.concatMapStrings (path: '' for f in : $(find ${path} -type f); do test "$f" == ":" && continue; - ensureDir $(dirname $out/lib/firmware/$\{f#${path}}); + mkdir -p $(dirname $out/lib/firmware/$\{f#${path}}); ln -s $f $out/lib/firmware/$\{f#${path}}; done; '') firmware; diff --git a/pkgs/os-specific/linux/qc-usb/builder.sh b/pkgs/os-specific/linux/qc-usb/builder.sh index a43138fa84f..041be115328 100644 --- a/pkgs/os-specific/linux/qc-usb/builder.sh +++ b/pkgs/os-specific/linux/qc-usb/builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/misc +mkdir -p $out/lib/modules/$version/misc LINUX_DIR=$kernel/lib/modules/$version/build PREFIX=$out diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index ff3cad3fe98..4dbe7e54247 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin chmod +x lightwatch.pl cp radeontool lightwatch.pl $out/bin ''; diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh index 62df45ea7c9..d466f075652 100644 --- a/pkgs/os-specific/linux/sysklogd/builder.sh +++ b/pkgs/os-specific/linux/sysklogd/builder.sh @@ -6,8 +6,8 @@ export prefix installFlags="BINDIR=$out/sbin MANDIR=$out/share/man INSTALL=install" patchPhase="sed -e 's@-o \${MAN_USER} -g \${MAN_GROUP} -m \${MAN_PERMS} @@' -i Makefile" -ensureDir "$out/share/man/man8/" -ensureDir "$out/share/man/man5/" -ensureDir "$out/sbin" +mkdir -p "$out/share/man/man8/" +mkdir -p "$out/share/man/man5/" +mkdir -p "$out/sbin" genericBuild diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrapper/builder.sh index 58bc1d4409d..7ea574fcf23 100644 --- a/pkgs/os-specific/linux/tcp-wrapper/builder.sh +++ b/pkgs/os-specific/linux/tcp-wrapper/builder.sh @@ -22,18 +22,18 @@ echo "building..." make REAL_DAEMON_DIR="$out/sbin" linux # Install -ensureDir "$out/sbin" +mkdir -p "$out/sbin" cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" -ensureDir "$out/lib" +mkdir -p "$out/lib" cp -v shared/lib*.so* "$out/lib" -ensureDir "$out/include" +mkdir -p "$out/include" cp -v *.h "$out/include" -ensureDir "$out/man" +mkdir -p "$out/man" for i in 3 5 8; do - ensureDir "$out/man/man$i" + mkdir -p "$out/man/man$i" cp *.$i "$out/man/man$i" ; done diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index f4c3aad938f..8ea3599ff19 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { makeFlags = [ "tunctl" ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tunctl $out/bin ''; diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 4e440770ef9..3c5fb2283cd 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' t=$out/etc/bash_completion.d - ensureDir $t + mkdir -p $t cp ${./upstart-bash-completion} $t/upstart ''; diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix index 73e5694572a..4fff3ed37c0 100644 --- a/pkgs/os-specific/linux/wis-go7007/default.nix +++ b/pkgs/os-specific/linux/wis-go7007/default.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir \ --replace '$(DESTDIR)$(FIRMWARE_DIR)' '$(FIRMWARE_DIR)' - ensureDir $includeDir - ensureDir $out/etc/hotplug/usb - ensureDir $out/etc/udev/rules.d + mkdir -p $includeDir + mkdir -p $out/etc/hotplug/usb + mkdir -p $out/etc/udev/rules.d makeFlagsArray=(KERNELSRC=$kernelSource \ FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \ @@ -72,7 +72,7 @@ stdenv.mkDerivation { ''; # */ postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin cp apps/gorecord apps/modet $out/bin/ ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index fcb6641dfd9..a0e426e482b 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -35,10 +35,10 @@ in }) ]; postInstall = '' - ensureDir $out/share/man/man5 $out/share/man/man8 + mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v doc/docbook/*.5 $out/share/man/man5/ cp -v doc/docbook/*.8 $out/share/man/man8/ - ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services + mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services cp -v dbus/*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index f04297096d2..c5cc5f3b68f 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' make DESTDIR="$out" LIBDIR="lib" install - ensureDir $out/include/xorg + mkdir -p $out/include/xorg echo -n "$confFile" > $out/include/xorg/10-multitouch.conf ''; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 9cc25174c51..98446c70867 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' - ensureDir $out/share/X11/xorg.conf.d + mkdir -p $out/share/X11/xorg.conf.d configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; |