From fe949d64ef417ec254fea7d2ae022b1f78f4ad1e Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <tgagnaux@gmail.com>
Date: Sat, 28 May 2022 17:40:04 +0200
Subject: [PATCH] libreoffice: rename libreoffice -> libreoffice-bin

---
 pkgs/applications/office/libreoffice/common.nix | 10 ----------
 .../office/libreoffice/darwin/default.nix       | 17 +++++++++++------
 .../applications/office/libreoffice/default.nix |  8 +++++++-
 pkgs/top-level/all-packages.nix                 |  7 ++++---
 4 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/office/libreoffice/common.nix

diff --git a/pkgs/applications/office/libreoffice/common.nix b/pkgs/applications/office/libreoffice/common.nix
deleted file mode 100644
index b1c547feb366..000000000000
--- a/pkgs/applications/office/libreoffice/common.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib }:
-{
-  meta = with lib; {
-    description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
-    homepage = "https://libreoffice.org/";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ raskin tricktron ];
-    platforms = platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ];
-  };
-}
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index d1a47d467911..5fdf2544ef46 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -10,7 +10,6 @@ let
   appName = "LibreOffice.app";
   scriptName = "soffice";
   version = "7.3.3";
-  common = import ../common.nix { inherit lib; };
 
   dist = {
     aarch64-darwin = rec {
@@ -30,7 +29,6 @@ let
 in
 stdenvNoCC.mkDerivation {
   inherit version;
-  inherit (import ../common.nix { inherit lib; }) meta;
   pname = "libreoffice";
   src = fetchurl {
     inherit (dist.${stdenvNoCC.hostPlatform.system} or
@@ -69,9 +67,16 @@ stdenvNoCC.mkDerivation {
         set -eou pipefail
 
         # reset version first so that both platforms are always updated and in sync
-        update-source-version libreoffice 0 ${lib.fakeSha256} --file=${currentFile} --system=aarch64-darwin
-        update-source-version libreoffice ${newVersion} ${newAarch64Sha256} --file=${currentFile} --system=aarch64-darwin
-        update-source-version libreoffice 0 ${lib.fakeSha256} --file=${currentFile} --system=x86_64-darwin
-        update-source-version libreoffice ${newVersion} ${newX86_64Sha256} --file=${currentFile} --system=x86_64-darwin
+        update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${currentFile} --system=aarch64-darwin
+        update-source-version libreoffice-bin ${newVersion} ${newAarch64Sha256} --file=${currentFile} --system=aarch64-darwin
+        update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${currentFile} --system=x86_64-darwin
+        update-source-version libreoffice-bin ${newVersion} ${newX86_64Sha256} --file=${currentFile} --system=x86_64-darwin
       '';
+  meta = with lib; {
+    description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
+    homepage = "https://libreoffice.org/";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ tricktron ];
+    platforms = [ "x86_64-darwin" "aarch64-darwin" ];
+  };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 978c2da26a78..74a4c156b830 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -581,5 +581,11 @@ in
 
   requiredSystemFeatures = [ "big-parallel" ];
 
-  inherit (import ./common.nix { inherit lib; }) meta;
+  meta = with lib; {
+    description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
+    homepage = "https://libreoffice.org/";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+  };
 }).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; }))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43e9efa515b4..2eac3b4d6eed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27772,9 +27772,10 @@ with pkgs;
     boost = boost175;
   };
 
-  libreoffice = if stdenv.isDarwin
-    then callPackage ../applications/office/libreoffice/darwin { }
-    else hiPrio libreoffice-still;
+  libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
+
+  libreoffice = hiPrio libreoffice-still;
+
   libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice;
 
   libreoffice-args = {