From 92eee7ea7694f27e7fb197fac25597a4b4e1e015 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 7 Aug 2025 13:55:41 +0300
Subject: [PATCH] calamares-nixos: convert to wrapper

---
 pkgs/by-name/ca/calamares-nixos/package.nix | 30 +++++++++++++++++++++
 pkgs/by-name/ca/calamares/package.nix       |  7 -----
 pkgs/top-level/all-packages.nix             |  1 -
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/ca/calamares-nixos/package.nix

diff --git a/pkgs/by-name/ca/calamares-nixos/package.nix b/pkgs/by-name/ca/calamares-nixos/package.nix
new file mode 100644
index 000000000000..fdf2363a7807
--- /dev/null
+++ b/pkgs/by-name/ca/calamares-nixos/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  runCommand,
+  makeWrapper,
+  calamares,
+  calamares-nixos-extensions,
+}:
+runCommand "calamares-wrapped"
+  {
+    inherit (calamares) version meta;
+
+    nativeBuildInputs = [ makeWrapper ];
+  }
+  ''
+    mkdir -p $out/bin
+
+    cd ${calamares}
+
+    for i in *; do
+      if [ "$i" == "bin" ]; then
+        continue
+      fi
+      ln -s ${calamares}/$i $out/$i
+    done
+
+    makeWrapper ${lib.getExe calamares} $out/bin/calamares \
+      --prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share \
+      --prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc \
+      --add-flag --xdg-config
+  ''
diff --git a/pkgs/by-name/ca/calamares/package.nix b/pkgs/by-name/ca/calamares/package.nix
index 5c05905ea352..e360955ff6d3 100644
--- a/pkgs/by-name/ca/calamares/package.nix
+++ b/pkgs/by-name/ca/calamares/package.nix
@@ -19,10 +19,8 @@
   os-prober,
   xkeyboard_config,
 
-  nixos-extensions ? false,
   # passthru.tests
   calamares-nixos,
-  calamares-nixos-extensions,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -101,11 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
         util-linux
       ]
     }"
-  ]
-  ++ lib.optionals nixos-extensions [
-    "--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share"
-    "--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc"
-    "--add-flag --xdg-config"
   ];
 
   passthru.tests = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca72218da19d..3d446a33b90c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1904,7 +1904,6 @@ with pkgs;
       '';
     });
 
-  calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
   candle = libsForQt5.callPackage ../applications/misc/candle { };
 
   capstone = callPackage ../development/libraries/capstone { };