chore: fix path

JuliaCN · Oct 30, 2023 · 1a1f61c · 1a1f61c
1 parent c74b48c
commit 1a1f61c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/nix/std/cells/julia2nix/devshells/default.nix b/nix/std/cells/julia2nix/devshells/default.nix
@@ -64,7 +64,7 @@ l.mapAttrs (_: std.lib.dev.mkShell) {
       env = [
         {
           name = "NIX_PATH";
-          value = "nixpkgs=${nixpkgs.path}";
+          value = "nixpkgs=${inputs.nixpkgs-lock.outPath}";
         }
       ];
     };

diff --git a/nix/std/cells/julia2nix/packages/default.nix b/nix/std/cells/julia2nix/packages/default.nix
@@ -87,9 +87,7 @@ in
     inherit src;
     name = "julia-wrapped-julia2nix";
     package = cell.lib.julia-wrapped {
-      extraInstallPhase = ''
-        export nixpkgs-prefetch=${inputs.nixpkgs-lock.outPath}"
-      '';
+      makeWrapperArgs = [ "--set NIX_PATH nixpkgs=${inputs.nixpkgs-lock.outPath}" ];
       extraBuildInputs = with inputs.nixpkgs; [
         alejandra
         nixUnstable
@@ -113,7 +111,7 @@ in
     name = "julia2nix-write-all-systems";
     runtimeInputs = [ cell.packages.build-project ];
     text = ''
-      export NIX_PATH=${inputs.main.inputs.nixpkgs-lock.outPath}
+      export NIX_PATH=${inputs.nixpkgs-lock.outPath}
       julia ${std.incl self [ "testenv" ]}/testenv/writejulia2nix.jl
     '';
   };

diff --git a/src/JuNix/util.jl b/src/JuNix/util.jl
@@ -64,7 +64,7 @@ Prefetch sha256 with `nix-prefetch`
 function fetch_sha256(fetcher::Fetcher, opts::Options)
     parsed = parse_fetcher(fetcher, opts)
     expr = """
-               let pkgs = import "/nix/store/cwr7p465zbfp60hg3jng1cfkmq14ka49-source" { };
+               let pkgs = import <nixpkgs> { };
                in with pkgs; $(fetcher.name)
            """
     cmd = `nix-prefetch $expr $(parsed)`