manual_inherit

packages/proton-cachyos/default.nix

@@ -23,19 +23,16 @@ let
   versionSpec = importJSON ./version.json;
   selected = selectVariant versionSpec variant null;
   vars = selected.variables or { };
-  base = vars.base;
-  release = vars.release;
 
   toolTitle = "proton-${variant}-latest";
 
-  # Derived values for the current variant
-  releaseVersion = "${releasePrefix}${base}-${release}${releaseSuffix}";
-  homepage = "https://github.com/${owner}/${repo}";
+  releaseVersion = "${releasePrefix}${vars.base}-${vars.release}${releaseSuffix}";
+  homepage = "https://${owner}/${repo}";
   url = "${homepage}/releases/download/${releaseVersion}/${tarballPrefix}${releaseVersion}${tarballSuffix}";
 
   # Choose fetcher based on file type
   intake =
-    if lib.strings.hasSuffix ".zip" url then
+    if lib.hasSuffix ".zip" url then
       {
         fetcher = fetchzip;
         input = "$src/*.tar.xz";
@@ -48,7 +45,7 @@ let
 in
 stdenvNoCC.mkDerivation {
   name = repo;
-  version = "${base}.${release}";
+  version = "${vars.base}.${vars.release}";
 
   src = intake.fetcher {
     inherit url;
@@ -60,7 +57,7 @@ stdenvNoCC.mkDerivation {
     tar -C $out/bin --strip=1 -x -f ${intake.input}
   ''
   # Allow to keep the same name between updates
-  + lib.strings.optionalString (toolTitle != null) ''
+  + lib.optionalString (toolTitle != null) ''
     sed -i -r 's|"${toolPattern}"|"${toolTitle}"|' $out/bin/compatibilitytool.vdf
   '';