diff options
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/impressive/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/mmex/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/openoffice/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/applications/office/openoffice/get-go-src.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/openoffice/go-oo.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index aa09b48ab2785..f1de422fa249b 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -25,7 +25,7 @@ in ''; installPhase = '' - ensureDir "$out/bin" "$out/share/doc/impressive" + mkdir -p "$out/bin" "$out/share/doc/impressive" mv impressive.py "$out/bin/impressive" mv * "$out/share/doc/impressive" diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 1e7aa756471f1..d56f4bed0ce9e 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -19,7 +19,7 @@ in ''; installPhase = '' - ensureDir $out/opt/mmex + mkdir -p $out/opt/mmex cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex ''; diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 131e85de5bf66..2c6e04e049be5 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -70,7 +70,7 @@ installPhase() { -f openoffice.lst -l en-US -p OpenOffice \ -buildid $BUILD -simple $ooFiles) - ensureDir $out/bin + mkdir -p $out/bin for i in soffice ooffice; do wrapSOffice $i; done # Create some wrappers to start individual OpenOffice components. @@ -78,7 +78,7 @@ installPhase() { # Create symlinks to desktop files, so that openoffice.org apps can be picked from # the application menu in KDE and GNOME - ensureDir $out/share + mkdir -p $out/share ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications # Apply a minor correction to the *.desktop files in order to correctly address the icons diff --git a/pkgs/applications/office/openoffice/get-go-src.nix b/pkgs/applications/office/openoffice/get-go-src.nix index ebdb586bd47a4..439da36638103 100644 --- a/pkgs/applications/office/openoffice/get-go-src.nix +++ b/pkgs/applications/office/openoffice/get-go-src.nix @@ -28,7 +28,7 @@ lib.overrideDerivation go_oo (attrs: { makesh = '' sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download - ensureDir $out + mkdir -p $out set +e ./download --all | grep XXX | diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 241c2ff2a130e..59cd517b55cd7 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' bin/ooinstall $out - ensureDir $out/bin + mkdir -p $out/bin for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do ln -s $a $out/bin done |