about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2024-06-20 15:33:40 +0300
committerGitHub <noreply@github.com>2024-06-20 15:33:40 +0300
commitd549d0c29efc4bbe8d0fa7e0a9924929739acfa1 (patch)
tree57d4e049268687f5abb7d9c196b02ed666518f00 /pkgs
parentcb3cfc25632eb77957c23e93f551dfd73c9ef47e (diff)
parentc51da30a140948f451317bc432ab02fc56a2b5c0 (diff)
Merge pull request #317308 from SuperSandro2000/libreoffice-qt6
libreoffice: add libreoffice-qt6{,-unwrapped} aliases, little cleanup
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51d42873a4279..ac156a0a2bbde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32297,13 +32297,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;
@@ -32320,6 +32318,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;