diff options
Diffstat (limited to 'pkgs/development/libraries')
67 files changed, 82 insertions, 82 deletions
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index afd640b625d6..ff42e47ea56b 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -15,7 +15,7 @@ installPhase() { make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include cd $out/include/X11 && ln -s Xaw3d Xaw - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" } diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index 9aa08caf00f4..c15e27695ac9 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -48,14 +48,14 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out"/lib - ensureDir "$out"/include/Box2D + mkdir -p "$out"/lib + mkdir -p "$out"/include/Box2D cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib cp -r Source "$out"/include/Box2D/Source find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';' sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h cp Include/Box2D.h "$out"/include/Box2D - ensureDir "$out/share" + mkdir -p "$out/share" cp -r Examples "$out/share" '' ["minInit" "addInputs" "doMake" "defEnsureDir"]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 5dbb31e9bcef..d5471b9be75f 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -28,7 +28,7 @@ rec { '' ["minInit" "addInputs" "doUnpack"]; demoInstall = fullDepEntry('' - ensureDir $out/bin + mkdir -p $out/bin cp Demo/chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix index a40044ee3a34..d1c081f45d85 100644 --- a/pkgs/development/libraries/clapack/default.nix +++ b/pkgs/development/libraries/clapack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ cmake ]; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib cp ../INCLUDE/* $out/include ''; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index f070f2dfaef2..121f41a0f3c5 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index 7ac4568a4e13..e1c59846aec5 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-3.5"; src = "${windir}/Microsoft.NET/Framework/v3.5"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index b9ce4738d129..701464071d03 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-4.0"; src = "${windir}/Microsoft.NET/Framework/v4.0.30319"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh index 47cd1b5e252f..6ac1d223b47e 100644 --- a/pkgs/development/libraries/eglibc/builder.sh +++ b/pkgs/development/libraries/eglibc/builder.sh @@ -20,7 +20,7 @@ preConfigure() { done # Include source for debugging - ensureDir $out/src + mkdir -p $out/src cp -R libc ports $out/src ln -s $out/src/ports $out/src/libc/ports # glibc wants -O2 minimum diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix index 1454d2ec94a9..1f4df39408e8 100644 --- a/pkgs/development/libraries/glfw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ mesa libX11 libXext ]; buildPhase = '' - ensureDir $out + mkdir -p $out make x11-install PREFIX=$out ''; diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix index 31a8ef13a4fe..95778b50b70b 100644 --- a/pkgs/development/libraries/glibc-2.13/default.nix +++ b/pkgs/development/libraries/glibc-2.13/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix index 84a16fefce9d..75bd996d9bc5 100644 --- a/pkgs/development/libraries/glibc-2.13/info.nix +++ b/pkgs/development/libraries/glibc-2.13/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix index d598e0e094dc..b7eae50ca385 100644 --- a/pkgs/development/libraries/glibc-2.13/locales.nix +++ b/pkgs/development/libraries/glibc-2.13/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix index 31a8ef13a4fe..95778b50b70b 100644 --- a/pkgs/development/libraries/glibc-2.14/default.nix +++ b/pkgs/development/libraries/glibc-2.14/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix index 84a16fefce9d..75bd996d9bc5 100644 --- a/pkgs/development/libraries/glibc-2.14/info.nix +++ b/pkgs/development/libraries/glibc-2.14/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix index d598e0e094dc..b7eae50ca385 100644 --- a/pkgs/development/libraries/glibc-2.14/locales.nix +++ b/pkgs/development/libraries/glibc-2.14/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix index 0cfad2990383..b778743147e6 100644 --- a/pkgs/development/libraries/glibc-2.9/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; preInstall = if (cross != null) then '' - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 '' else ""; diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc-2.9/info.nix index 3201bb474405..cc79bbece3d2 100644 --- a/pkgs/development/libraries/glibc-2.9/info.nix +++ b/pkgs/development/libraries/glibc-2.9/info.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir $out/share/info + mkdir -p $out/share/info cp ../$sourceRoot/manual/*.info $out/share/info ''; diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc-2.9/locales.nix index 3046374ca345..c7b1bb2bff0a 100644 --- a/pkgs/development/libraries/glibc-2.9/locales.nix +++ b/pkgs/development/libraries/glibc-2.9/locales.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/lib/locale + mkdir -p $out/lib/locale cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ ''; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index c01987bcc59d..04fbb01a3bfc 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["createDirs" "setVars" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,share/info,include/gsm} + mkdir -p "$out/"{bin,lib,share/man,share/info,include/gsm} '' ["minInit" "defEnsureDir"]; setVars = a.noDepEntry '' diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 3f5bac4d7e4e..567e5e2300a7 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -126,12 +126,12 @@ ./Setup copy - ensureDir $out/bin # necessary to get it added to PATH + mkdir -p $out/bin # necessary to get it added to PATH local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version} local installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf - ensureDir $confDir + mkdir -p $confDir ./Setup register --gen-pkg-config=$pkgConf if test -f $pkgConf; then echo '[]' > $installedPkgConf diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 76f4a5a7dae0..78206de9f141 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preInstall = '' sed -i s,/usr/local,$out, src/makefile.linux - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 9b45dbb91ec8..55c4dbff2960 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec{ buildFlags = "libiniparser.so"; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cp libiniparser.so.0 $out/lib ln -s libiniparser.so.0 $out/lib/libiniparser.so - ensureDir $out/include + mkdir -p $out/include cp src/*.h $out/include - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} for i in AUTHORS INSTALL LICENSE README; do bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index f713ef2f645a..9cd61adf7756 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp maxmindgeoip.jar $out/share/java ''; meta = { diff --git a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh index 605daff0cc85..d37e110011e8 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh +++ b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/share/java +mkdir -p $out/share/java cp $src $out/share/java/$name.jar diff --git a/pkgs/development/libraries/java/gwt-widgets/builder.sh b/pkgs/development/libraries/java/gwt-widgets/builder.sh index f8961eb4f048..8c2502385f2b 100644 --- a/pkgs/development/libraries/java/gwt-widgets/builder.sh +++ b/pkgs/development/libraries/java/gwt-widgets/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup tar xfvz $src cd gwt-widgets-* -ensureDir $out/share/java +mkdir -p $out/share/java cp gwt-widgets-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/hsqldb/builder.sh b/pkgs/development/libraries/java/hsqldb/builder.sh index 2f146a523487..d7de23ab95eb 100755 --- a/pkgs/development/libraries/java/hsqldb/builder.sh +++ b/pkgs/development/libraries/java/hsqldb/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup unzip $src cd hsqldb* -ensureDir $out +mkdir -p $out cp -R * $out/ diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index bb8c67285c5a..1439c6101ab9 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/lib/java" + mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; } diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix index e384e35b23fa..03433048270f 100644 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ b/pkgs/development/libraries/java/jetty-gwt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix index 8f1f676c1070..349339aad440 100644 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ b/pkgs/development/libraries/java/jetty-util/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 300266fff5c0..800ae7ba7185 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -23,7 +23,7 @@ in '' find -name \*.jar -or -name \*.class -exec rm -v {} \; # The build process tries to download it by itself. - ensureDir "build/tmp-xbean" + mkdir -p "build/tmp-xbean" ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; @@ -34,7 +34,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index ab67fc6b8934..bf1ee340d46f 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildCommand = " unzip $src -d $out - ensureDir $out/bin + mkdir -p $out/bin cat > $out/bin/saxon8 <<EOF #! $shell export JAVA_HOME=${jre} diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh index 276e3f6e6a91..bf86d59497e4 100644 --- a/pkgs/development/libraries/java/smack/builder.sh +++ b/pkgs/development/libraries/java/smack/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup tar xfvz $src cd smack* -ensureDir $out/share/java +mkdir -p $out/share/java cp *.jar $out/share/java diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh index 0a2f304801ec..9f678d7158bb 100644 --- a/pkgs/development/libraries/java/swt/builder.sh +++ b/pkgs/development/libraries/java/swt/builder.sh @@ -7,12 +7,12 @@ export JAVA_HOME=${jdk} echo $JAVA_HOME=${jdk} sh ./build.sh make_swt make_atk -ensureDir $out/lib +mkdir -p $out/lib cp *.so $out/lib mkdir out javac -d out/ $(find org/ -name "*.java") -ensureDir $out/jars +mkdir -p $out/jars cp version.txt out/ cd out && jar -c * > $out/jars/swt.jar diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix index ededecdf0e51..0aee98d27bda 100644 --- a/pkgs/development/libraries/java/xalanj/default.nix +++ b/pkgs/development/libraries/java/xalanj/default.nix @@ -24,7 +24,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/x*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix index 545bb21508c8..a40c30ae6c72 100644 --- a/pkgs/development/libraries/java/xerces/default.nix +++ b/pkgs/development/libraries/java/xerces/default.nix @@ -26,7 +26,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/xerces*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index a17cdf0b4d58..3028ba7367cb 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp lm.h $out/include cp liblevmar.a $out/lib ''; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 7d6ddd61581f..4ba938911a41 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; meta = { diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 30fd6835dfbb..ee5d2e5e50e0 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; postInstall = '' diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index b14809d47bf8..edcf177add7f 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = "-f makefile.u"; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp libf2c.a $out/lib cp f2c.h $out/include ''; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 508827b9b3d5..c8fa978534d9 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cd libmilter cat > a.m4 <<EOF define(\`confEBINDIR', \`$out/libexec') diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index a3a6a6423d87..ad524c21ff10 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i s,/usr,$out, usr/lib/pkgconfig/* - ensureDir $out + mkdir -p $out cp -R usr/lib $out cp -R usr/share $out ''; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 7ec95f03eff7..c6446ab27a54 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-pcap=linux"; - preInstall = ''ensureDir $out/bin''; + preInstall = ''mkdir -p $out/bin''; patches = [ ./libpcap_amd64.patch ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 4e13e5768f86..29a8c459c34c 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index b9dbaf23512d..b292580e7052 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses gpm]; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index b449d9c3ed38..20433ab14588 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 46dc1435bcd0..05ce8019c4ec 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [libxml2]; postInstall = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ ''; diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index dd0dab46b76d..0b795e78ad50 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -33,7 +33,7 @@ rec { '') ["preBuild" "addInputs"]; deploy = a.fullDepEntry ('' - ensureDir $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot + mkdir -p $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot cd ncbi/build cp *.o *.so $out/lib cp -r . $out/share/${name}/build-snapshot diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index ca792ed4c914..e03b9409cfa7 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/inc $out/include - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} cp -R ../doc $out/share/doc/${name} ''; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 6179742b42f7..0f9a3dc2b2da 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp exe/* $out/bin ''; } diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 016bd23cf1ca..b4c8a7f17890 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -74,7 +74,7 @@ let s=$out/bin/pg_db_postgis_enable sql_comments=$out/share/postgis-${version}/comments.sql - ensureDir $(dirname $sql_comments) + mkdir -p $(dirname $sql_comments) cp $(find -iname ${fix.fixed.sql_comments}) $sql_comments for script in $scriptNames; do diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 913f4acdc7dd..e231c20e7a3e 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { installPhase = '' cd .. - ensureDir $out/lib/qt4/plugins/script + mkdir -p $out/lib/qt4/plugins/script cp -av plugins/script/* $out/lib/qt4/plugins/script ''; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index a731360be562..3537dd3b4af3 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/lib" + mkdir -p "$out/lib" install -m755 *.a* "$out/lib" install -m755 *.so* "$out/lib" ln -sf liblapack.so.3 "$out/lib/liblapack.so" diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 01dc63353d66..f18107c48a5e 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { fi done - ensureDir $out/pcsc/drivers + mkdir -p $out/pcsc/drivers cp -R proprietary/* $out/pcsc/drivers ''; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 952d4ba9f255..4c615b81552f 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip scheme texinfo ]; configurePhase = '' - ensureDir "$out" + mkdir -p "$out" sed -i "Makefile" \ -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g" ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 7776b4d02594..4e1187aa0f76 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = "aoeu"; installPhase = '' - ensureDir $out + mkdir -p $out make install DESTDIR="$out" ''; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 211eecde4e43..8874a672ead0 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -35,7 +35,7 @@ rec { '' ["minInit" "doUnpack"]; doDeploy = a.fullDepEntry '' - ensureDir "$out"/{bin,lib} + mkdir -p "$out"/{bin,lib} for d in bin lib; do for i in ./$d/*; do test "$(basename "$i")" = "Makefile" || diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index b025e9a68a9b..dafa82bad347 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "headers" ]; postInstall = '' - ensureDir $lib + mkdir -p $lib cp -av $out/lib* $lib - ensureDir $headers + mkdir -p $headers cp -av $out/include $headers ''; })) diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index 00558fc52e9d..d1611cda623a 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { preConfigure = '' export PREFIX=$out - ensureDir $out/lib - ensureDir $out/include + mkdir -p $out/lib + mkdir -p $out/include ''; NIX_CFLAGS = "-fPIC"; diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix index 1cb6472971c4..14335e6a3adb 100644 --- a/pkgs/development/libraries/tcp-wrappers/default.nix +++ b/pkgs/development/libraries/tcp-wrappers/default.nix @@ -50,7 +50,7 @@ rec { '' ["minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out"/{sbin,lib} + mkdir -p "$out"/{sbin,lib} make libwrap.so cp libwrap.{a,so} "$out/lib" find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';' diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 1fbfdc58fceb..e669f8a254f1 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in" ''; - preInstall = "ensureDir $out/etc"; + preInstall = "mkdir -p $out/etc"; doCheck = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 9e60f1ce8ba1..b67b015e018d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib cp -v libv8.* $out/lib cp -v shell $out/bin/v8-shell diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 63c6574d32ad..2daa1796318f 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -69,7 +69,7 @@ rec { '') ["minInit" "doUnpack"]; doAddPrograms = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin for i in Programs/.libs/* Programs/*; do cp $i $out/bin/webkit-program-$(basename $i) || true done diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix index 5eaaeec3d168..d41d4683d6e9 100644 --- a/pkgs/development/libraries/webkit/svn.nix +++ b/pkgs/development/libraries/webkit/svn.nix @@ -70,7 +70,7 @@ rec { '') ["minInit" "doUnpack"]; doAddPrograms = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin for i in Programs/.libs/* Programs/*; do cp $i $out/bin/webkit-program-$(basename $i) || true done diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 5ccfc1a7391f..6db9469e46d2 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -5,7 +5,7 @@ pushd unzipped unzip $src || true popd -ensureDir $out +mkdir -p $out mv unzipped/* $out/ # Remove crap in the root directory. diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index 3417596c3930..b6bc94814e64 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec { # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index bb7643330a08..93d31ada975c 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec { # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index d8bc32350fb9..07220d6e1a65 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; buildPhase = "true"; - installPhase = "ensureDir $out"; + installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; propagatedBuildInputs = packages; } // { |