Radish alpha
r
rad:z4D5UCArafTzTQpDZNQRuqswh3ury
Radicle desktop app
Radicle
Git
use importNpmLock to build node_modules instead of fetchNpmDeps
Merged did:key:z6MktsSu...smhu opened 11 months ago

refactor the packaging function with importNpmLock instead of fetchNpmDeps to do away with having to update the flake via the script all the time.

1 file changed +6 -7 28045a0c 1062c53f
modified flake.nix
@@ -61,12 +61,11 @@
        radicle-desktop = pkgs.callPackage (
          {
            lib,
-
            fetchNpmDeps,
+
            importNpmLock,
            rust-bin,
            makeRustPlatform,
            cargo-tauri,
            nodejs,
-
            npmHooks,
            pkg-config,
            wrapGAppsHook4,
            glib,
@@ -96,16 +95,16 @@
              };
            };

-
            npmDeps = fetchNpmDeps {
-
              name = pname + "-npm-deps-" + version;
-
              inherit src;
-
              hash = "sha256-KECQdLg9lUJ/H0xn+5ejJOtBvzUGe3nTi0lrJ/vkr6E="; # npmDepsHash : Update canary, don't touch!
+
            npmDeps = importNpmLock {
+
              inherit version;
+
              pname = pname + "-npm-deps";
+
              npmRoot = ./.;
            };

            nativeBuildInputs = [
              cargo-tauri.hook
              nodejs
-
              npmHooks.npmConfigHook
+
              importNpmLock.npmConfigHook
              pkg-config
              wrapGAppsHook4
            ];