From c51da30a140948f451317bc432ab02fc56a2b5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Jun 2024 23:50:35 +0200 Subject: [PATCH] libreoffice: add libreoffice-qt6{,-unwrapped} aliases, little cleanup --- pkgs/top-level/all-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9f0fb9cc21a..fed342fb84f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32391,13 +32391,11 @@ with pkgs; libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; + libreoffice-unwrapped = libreoffice.unwrapped; libreoffice-qt = hiPrio libreoffice-qt-still; - libreoffice-qt-unwrapped = libreoffice-qt.unwrapped; - libreoffice-unwrapped = libreoffice.unwrapped; - libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { kdeIntegration = true; @@ -32414,6 +32412,9 @@ with pkgs; }); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; + libreoffice-qt6 = hiPrio libreoffice-qt6-still; + libreoffice-qt6-unwrapped = libreoffice-qt6.unwrapped; + libreoffice-qt6-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = kdePackages.callPackage ../applications/office/libreoffice { kdeIntegration = true;