fix suffix usage

chaotic-cx · Jul 15, 2024 · 3305e54 · 3305e54 · github-actions · Jul 16, 2024
1 parent 989dc48
commit 3305e54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/pkgs/linux-cachyos/prepare.nix b/pkgs/linux-cachyos/prepare.nix
@@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit cachyConfig makeEnv stdenv;
     kernelPatches = patches;
     extraVerPatch = ''
-      sed -Ei"" 's/EXTRAVERSION =(.+)$/EXTRAVERSION =\1-cachyos/g' Makefile
+      sed -Ei"" 's/EXTRAVERSION = ?(.*)$/EXTRAVERSION = \1${cachyConfig.versions.suffix}/g' Makefile
     '';
   };
 })
diff --git a/pkgs/linux-cachyos/versions-hardened.json b/pkgs/linux-cachyos/versions-hardened.json
@@ -1,4 +1,5 @@
 {
+  "suffix": "-cachyos",
   "linux": {
     "version": "6.9.9",
     "hash": "sha256-K+BbSH6yOaO/aH1iio8QQXfQnDEPALzCpeUPFzNCHrk="

diff --git a/pkgs/linux-cachyos/versions-rc.json b/pkgs/linux-cachyos/versions-rc.json
@@ -1,4 +1,5 @@
 {
+  "suffix": "-cachyos",
   "linux": {
     "version": "6.10-rc7",
     "hash": "sha256-M7MupqhPAWsv4HfDH4zhgRBI+Oxdk/RrXgnltXX7xg0="