WIP: login-inner: get rid of gnused in flake bootstrap

nix-community · Jul 7, 2024 · a3e6a33 · a3e6a33
1 parent 7f1432e
commit a3e6a33
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
@@ -81,14 +81,33 @@ writeText "login-inner" ''
 
         ${lib.optionalString config.build.flake.inputOverrides ''
           echo "Overriding input urls in the flake..."
-          ${nixCmd} run nixpkgs#gnused -- \
-            -i \
-            -e 's,\"github:NixOS/nixpkgs.*\",\"${config.build.flake.nixpkgs}\",' \
-            -e 's,\"github:nix-community/nix-on-droid.*\",\"${config.build.flake.nix-on-droid}\",' \
-            "${config.user.home}/.config/nix-on-droid/flake.nix"
+          while IFS="" read -r p || [[ -n "$p" ]]
+          do
+              if [[ $p =~ (.*)github:NixOS/nixpkgs.*\"\; ]]; then
+                  printf "''${BASH_REMATCH[1]}${config.build.flake.nixpkgs}\";\n" "$p"
+              else
+                  printf '%s\n' "$p"
+              fi
+          done < "${config.user.home}/.config/nix-on-droid/flake.nix" \
+               > "${config.user.home}/.config/nix-on-droid/flake.nix.tmp"
+          cat "${config.user.home}/.config/nix-on-droid/flake.nix.tmp" \
+            > "${config.user.home}/.config/nix-on-droid/flake.nix"
         ''}
 
         echo "Overriding system value in the flake..."
+        while IFS="" read -r p || [[ -n "$p" ]]
+        do
+          if [[ $p =~ (.*)github:nix-community/nix-on-droid.*\"\; ]]; then
+              printf "''${BASH_REMATCH[1]}${config.build.flake.nix-on-droid}\";\n" "$p"
+          else
+              printf '%s\n' "$p"
+          fi
+        done < "${config.user.home}/.config/nix-on-droid/flake.nix" \
+             > "${config.user.home}/.config/nix-on-droid/flake.nix.tmp"
+        cat "${config.user.home}/.config/nix-on-droid/flake.nix.tmp" \
+          > "${config.user.home}/.config/nix-on-droid/flake.nix"
+
+
         ${nixCmd} run nixpkgs#gnused -- \
           -i \
           -e 's,\"aarch64-linux",\"${targetSystem}\",' \
@@ -99,6 +118,8 @@ writeText "login-inner" ''
 
         . "${config.user.home}/.nix-profile/etc/profile.d/nix-on-droid-session-init.sh"
 
+        rm -f "${config.user.home}/.config/nix-on-droid/flake.nix.tmp"
+
       fi
 
       echo