scripts/nix: fix `cache`

This reverts commit 5923066630.

modules/nixos/profiles/desktop/android-dev.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   cfg = config.profiles.desktop;
-  defaultJdk = pkgs.openjdk21;
+  defaultJdk = pkgs.openjdk22;
   toolchains = [pkgs.openjdk17 defaultJdk];
 in {
   options.profiles.desktop.android-dev = with lib; {
@@ -33,9 +33,9 @@ in {
         enable = true;
         package = pkgs.callPackage (pkgs.gradleGen
           {
-            version = "8.7";
-            nativeVersion = "0.22-milestone-25";
-            hash = "sha256-VEw11r2Emuil7QvOo5umd9xA9J330YNVYVgtogCblh0=";
+            version = "8.8-rc-1";
+            nativeVersion = "0.22-milestone-26";
+            hash = "sha256-ouHP7n/97uhgFbhbLdKkNQMsQO7cAdgXIoVVbH2P6hM=";
             defaultJava = defaultJdk;
           }) {};
         settings = {

overlays/default/default.nix

@@ -1,10 +1,10 @@
 {inputs, ...}: _final: prev: {
   attic = inputs.attic.packages.${prev.system}.attic-client;
   # Force the use of the JDK we're using everywhere else
-  jdk = prev.openjdk21;
-  jdk_headless = prev.openjdk21_headless;
-  jre = prev.openjdk21;
-  jre_headless = prev.openjdk21_headless;
+  jdk = prev.openjdk22;
+  jdk_headless = prev.openjdk22_headless;
+  jre = prev.openjdk22;
+  jre_headless = prev.openjdk22_headless;
   # Silence warnings about existing files
   megatools = prev.megatools.overrideAttrs (_: {
     patches = [./megatools.patch];

packages/pidcat/default.nix

@@ -15,6 +15,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-VOIND2CzWo+LV84C+FbTC0r3FqY7VpBaWn95IKTYFT8=";
   };
 
+  # Nixpkgs breaks the `env -S` part somehow
+  dontPatchShebangs = true;
+
   nativeBuildInputs = [installShellFiles];
 
   postInstall = ''

scripts/nix

@@ -47,9 +47,10 @@ function nixb() {
 }
 
 function cache() {
-  local CACHE_PATHS ARCH KERNEL
-  CACHE_PATHS="${1}"
+  declare -a CACHE_PATHS
+  local ARCH KERNEL
+  CACHE_PATHS=("$@")
   ARCH="$(uname -m)"
   KERNEL="$(uname --kernel-name | tr '[:upper:]' '[:lower:]')"
-  attic push "${ARCH}-${KERNEL}" "${CACHE_PATHS:?}"
+  attic push "${ARCH}-${KERNEL}" "${CACHE_PATHS[@]:?}"
 }

systems/x86_64-linux/ryzenbox/default.nix

@@ -114,7 +114,7 @@
       # Minecraft
       mcaselector
       (prismlauncher.override {
-        jdks = [openjdk21];
+        jdks = [openjdk22];
         withWaylandGLFW = config.profiles.desktop.gnome3.enable;
       })
     ];