diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/libreoffice/default.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice.nix rename to pkgs/applications/office/libreoffice/default.nix diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh similarity index 100% rename from pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh rename to pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice-srcs.nix rename to pkgs/applications/office/libreoffice/libreoffice-srcs.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35d0e8b3b4..18f106e5a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7402,7 +7402,7 @@ let librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; - libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { + libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; };