diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 14:56:10 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 14:56:10 +0200 |
| commit | 40f7b0f9df5a35d56d4f44fc02067f49d104a191 (patch) | |
| tree | 618348fbe292e1308c9f3c703f3b02c16ebe0b1c /pkgs/servers | |
| parent | 47075812ce0ca06e647ca8d2ab439dce060055a2 (diff) | |
| download | nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar.gz nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar.bz2 nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar.lz nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar.xz nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.tar.zst nixpkgs-40f7b0f9df5a35d56d4f44fc02067f49d104a191.zip | |
Another attempt to eradicate ensureDir
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dict/dictd-wiktionary.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/dict/dictd-wordnet.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/http/thttpd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/seyren/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/serfdom/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 9e9c05d2f91..370bfd39137 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { builder = writeScript "wiktionary-builder.sh" '' source $stdenv/setup - ensureDir $out/share/dictd/ + mkdir -p $out/share/dictd/ cd $out/share/dictd export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 063868ddc6e..b6680e8b21c 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { builder = writeScript "builder.sh" '' . ${stdenv}/setup - ensureDir $out/share/dictd/ + mkdir -p $out/share/dictd/ cd $out/share/dictd for i in ${wordnet}/dict/data.*; do diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index e03183cbe49..0bb3d96b37b 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir "$out/man/man1" + mkdir -p "$out/man/man1" sed -i -e 's/-o bin -g bin *//' Makefile sed -i -e '/chgrp/d' extras/Makefile ''; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 541c377c404..e6e15129568 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jre src ]; installPhase = '' - ensureDir "$out"/bin + mkdir -p "$out"/bin makeWrapper "${jre}/bin/java" "$out"/bin/seyren --add-flags "-jar $src" ''; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index fa9c48c6ea9..77852b6d2ed 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/influxdb" \ --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64" - ensureDir $out/share/influxdb + mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb ''; diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix index 274fc89f94d..9274ba86a70 100644 --- a/pkgs/servers/serfdom/default.nix +++ b/pkgs/servers/serfdom/default.nix @@ -112,7 +112,7 @@ in ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/serf $out/bin ''; |