From dd1bab10cd1977c2fa9d6be4ce93d3b0bbcb9aad Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 31 Aug 2024 10:24:51 +0200
Subject: [PATCH] libreoffice: Use fresh variant

---
 home/config/nil/desktop.nix |  2 +-
 overlay/no-x.nix            | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/home/config/nil/desktop.nix b/home/config/nil/desktop.nix
index cc6d65e..7d5db99 100644
--- a/home/config/nil/desktop.nix
+++ b/home/config/nil/desktop.nix
@@ -50,7 +50,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
     inkscape
     jellyfin-mpv-shim
     keepassxc
-    libreoffice
+    libreoffice-fresh
     obsidian
     restic
     signal-desktop
diff --git a/overlay/no-x.nix b/overlay/no-x.nix
index 808017a..d188a6b 100644
--- a/overlay/no-x.nix
+++ b/overlay/no-x.nix
@@ -108,11 +108,14 @@ in genAttrs [
       ++ [ (mesonBool "tests" false) ];
     });
 
+  libreoffice-fresh = prev.libreoffice-fresh.override {
+    unwrapped = prev.libreoffice-fresh.unwrapped.overrideAttrs (prevAttrs: {
+      configureFlags = prevAttrs.configureFlags or [ ]
+        ++ [ "--without-x" ];
+    });
+  };
 
-  libreoffice-unwrapped = prev.libreoffice-unwrapped.overrideAttrs (prevAttrs: {
-    configureFlags = prevAttrs.configureFlags or [ ]
-      ++ [ "--without-x" ];
-  });
+  libreoffice-fresh-unwrapped = final.libreoffice-fresh.unwrapped;
 
   libsForQt5 = prev.libsForQt5.overrideScope (final: prev: {
     inherit (final') qt5;