Merge PR #47

Flake: maintainance from Rexcrazy804/fix-nix

Author: uiriansan

default.nix

@@ -14,27 +14,31 @@
   withLayerShellQt ? true,
 }: let
   inherit (lib) cleanSource licenses;
+  inherit (lib) attrValues substring readFile concatStringsSep map;
+  inherit (lib.generators) toINI;
+  inherit (stdenvNoCC) mkDerivation;
 
-  theme-package = stdenvNoCC.mkDerivation (final: {
-    pname = "silent";
-    version = "${builtins.substring 0 8 gitRev}";
+  propagatedBuildInputs = attrValues {
+    inherit (kdePackages) qtmultimedia qtsvg qtvirtualkeyboard;
+  };
 
+  sddm-wrapped = kdePackages.sddm.override {
+    extraPackages = propagatedBuildInputs;
+    inherit withLayerShellQt withWayland;
+  };
+in
+  mkDerivation (final: {
+    inherit propagatedBuildInputs;
+
+    pname = "silent";
+    version = "${substring 0 8 gitRev}";
     src = cleanSource ./.;
 
     dontWrapQtApps = true;
 
-    propagatedBuildInputs = with kdePackages; [
-      qtmultimedia
-      qtsvg
-      qtvirtualkeyboard
-    ];
-
     installPhase = let
       basePath = "$out/share/sddm/themes/${final.pname}";
-      baseConfigFile = "${final.src}/configs/${theme}.conf";
-      overrides = lib.generators.toINI {} theme-overrides;
-      finalConfig = (builtins.readFile baseConfigFile) + "\n" + overrides;
-      finalConfigFile = writeText "${theme}.conf" finalConfig;
+      overrides = toINI {} theme-overrides;
     in ''
       mkdir -p ${basePath}
       cp -r $src/* ${basePath}
@@ -43,31 +47,23 @@
         --replace-warn configs/default.conf configs/${theme}.conf
 
       chmod +w ${basePath}/configs/${theme}.conf
-      cp ${finalConfigFile} ${basePath}/configs/${theme}.conf
+      echo '${overrides}' >> ${basePath}/configs/${theme}.conf
 
       chmod -R +w ${basePath}/backgrounds
-      ${builtins.concatStringsSep "\n" (builtins.map (bg: "cp ${bg} ${basePath}/backgrounds/${bg.name}") extraBackgrounds)}
+      ${concatStringsSep "\n" (map (bg: "cp ${bg} ${basePath}/backgrounds/${bg.name}") extraBackgrounds)}
     '';
 
-    meta.licenses = licenses.gpl3;
-    passthru.test = test;
-  });
-
-  sddm-wrapped = kdePackages.sddm.override {
-    extraPackages = theme-package.propagatedBuildInputs;
-    inherit withLayerShellQt withWayland;
-  };
+    passthru.test = symlinkJoin {
+      name = "test-sddm-silent";
+      paths = [sddm-wrapped];
+      nativeBuildInputs = [makeWrapper];
+      postBuild = ''
+        makeWrapper $out/bin/sddm-greeter-qt6 $out/bin/test-sddm-silent \
+          --suffix QML2_IMPORT_PATH ':' ${final.finalPackage}/share/sddm/themes/${final.pname}/components \
+          --set QT_IM_MODULE qtvirtualkeyboard \
+          --add-flags '--test-mode --theme ${final.finalPackage}/share/sddm/themes/${final.pname}'
+      '';
+    };
 
-  test = symlinkJoin {
-    name = "test-sddm-silent";
-    paths = [sddm-wrapped];
-    nativeBuildInputs = [makeWrapper];
-    postBuild = ''
-      makeWrapper $out/bin/sddm-greeter-qt6 $out/bin/test-sddm-silent \
-        --suffix QML2_IMPORT_PATH ':' ${theme-package}/share/sddm/themes/${theme-package.pname}/components \
-        --set QT_IM_MODULE qtvirtualkeyboard \
-        --add-flags '--test-mode --theme ${theme-package}/share/sddm/themes/${theme-package.pname}'
-    '';
-  };
-in
-  theme-package
+    meta.licenses = licenses.gpl3;
+  })