diff options
Diffstat (limited to 'pkgs/applications/networking')
26 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0be1d4dc48da..66c0f039403d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/libexec/chrome + mkdir -p $out/bin + mkdir -p $out/libexec/chrome cp -R * $out/libexec/chrome diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b6ec69ee3888..1b8fb796badd 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" - ensureDir $out/share/applications + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 99f135c6d7b4..7fc5ddbcce51 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { fi # Put the GNU IceCat icon in the right place. - ensureDir "$out/lib/$libDir/chrome/icons/default" + mkdir -p "$out/lib/$libDir/chrome/icons/default" ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh index 4db487f5c51c..b0f8a2638c18 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh index 4db487f5c51c..b0f8a2638c18 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index 0f738eb9cccc..86ecd2c33453 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -6,7 +6,7 @@ dontPatchELF=1 sourceRoot=. installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 890021b33d6e..37d5cbe039f1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -22,7 +22,7 @@ rec { '') ["doUnpack" "minInit"]; postInstall = a.fullDepEntry('' - ensureDir $out/share/${name}/plugin + mkdir -p $out/share/${name}/plugin ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 330fac098620..6ee1735f76c7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; installPhase = '' - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins ''; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index 7728f7abcfc5..6a86774226d3 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 0428ccdc7f32..58f65a2709ec 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 37f56a638068..026ab3fff1c5 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -59,14 +59,14 @@ rec { doDeploy = a.fullDepEntry '' TARGET_DIR="$out/share/oneteam/app" BUILD_DIR="$PWD" - ensureDir "$TARGET_DIR" + mkdir -p "$TARGET_DIR" cd "$TARGET_DIR" unzip "$BUILD_DIR/oneteam.xulapp" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam" echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" chmod a+x "$out/bin/oneteam" - ensureDir "$out/share/doc" + mkdir -p "$out/share/doc" cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam" '' ["defEnsureDir"]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 5e5cf311712a..cdbf63dbd9f1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; - preInstall = "ensureDir \$out/share"; + preInstall = "mkdir -p \$out/share"; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan"; buildInputs = [pidgin]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index cc6901c0384d..868b5dbb342b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -12,7 +12,7 @@ rec { ]; preBuild = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $(which convert) $out/bin ln -s $(which xelatex) $out/bin ln -s $(which dvips) $out/bin @@ -26,8 +26,8 @@ rec { '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; postInstall = fullDepEntry ('' - ensureDir $out/lib - ensureDir $out/share/pidgin-latex + mkdir -p $out/lib + mkdir -p $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex '') ["minInit" "defEnsureDir" "doMakeInstall"]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index b0819da4c6e5..7d04d9e9fec7 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" - ensureDir "$PSI_PLUGINS" + mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" PSI_QT_PLUGINS="$out/share/psi" - ensureDir "$PSI_QT_PLUGINS"/crypto + mkdir -p "$PSI_QT_PLUGINS"/crypto ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index 5f6112b53d08..4574b5a9b354 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = '' TARGET="$out/share/psi/plugins" - ensureDir "$TARGET" + mkdir -p "$TARGET" cp gstprovider/*.so "$TARGET"/ ''; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 440ab624a623..5a82cf9d6407 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms - ensureDir $out/lib/torchat + mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat makeWrapper ${python}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index ce9e84fd5724..8ddf784adc04 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp iptraf $out/bin ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix index 62b4d91de587..717d4012645d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { --replace /bin/ls "$(type -tP ls)" # Create a desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/thunderbird.desktop <<EOF [Desktop Entry] Type=Application diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 5c9e215f8764..e736d561cb41 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional jackSupport jackaudio); installPhase = '' - ensureDir $out + mkdir -p $out cp -r ./release $out/bin ''; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 9784d3692710..ea994c889e2f 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "offrss-1.1"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp offrss $out/bin ''; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index f189d2eb7813..1b601992aa6f 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -12,7 +12,7 @@ with builderDefs; openssl libX11 boost]; configureFlags = []; doScons = fullDepEntry ('' - ensureDir $out + mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; for i in gettext xgettext msgfmt msgcat; do diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 98abc0a3db7a..145414e5c3d3 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { # Byte code compilation (the ocaml opt compiler is not supported in many platforms) buildPhase = "make mlnet.byte"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp mlnet.byte $out/bin/mlnet ''; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 14bc1ead49b2..2dc909ca9157 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libsamplerate ]; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - ensureDir $out/share/${name}/samples + mkdir -p $out/share/${name}/samples cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples ''; diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 8d3645e38195..1eef323ae057 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; installPhase = '' - ensureDir $out/{opt/skype/,bin} + mkdir -p $out/{opt/skype/,bin} cp -r * $out/opt/skype/ fullPath= @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { --- > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png EOF - ensureDir $out/share/applications + mkdir -p $out/share/applications mv skype.desktop $out/share/applications ''; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 06bab807ebdd..e3b042aa810e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") + (if ! nativeCode then " NATIVE=false" else ""); - preInstall = "ensureDir $out/bin"; + preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index b20f862842c8..69a0a7efde83 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/{bin,sbin} $out/share/man/{man1,man5} + mkdir -p $out/{bin,sbin} $out/share/man/{man1,man5} cp src/vnstat $out/bin cp src/vnstatd $out/sbin cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1 |