Skip to content

Commit 1a1f61c

Browse files
committed
chore: fix path
1 parent c74b48c commit 1a1f61c

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

nix/std/cells/julia2nix/devshells/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ l.mapAttrs (_: std.lib.dev.mkShell) {
6464
env = [
6565
{
6666
name = "NIX_PATH";
67-
value = "nixpkgs=${nixpkgs.path}";
67+
value = "nixpkgs=${inputs.nixpkgs-lock.outPath}";
6868
}
6969
];
7070
};

nix/std/cells/julia2nix/packages/default.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ in
8787
inherit src;
8888
name = "julia-wrapped-julia2nix";
8989
package = cell.lib.julia-wrapped {
90-
extraInstallPhase = ''
91-
export nixpkgs-prefetch=${inputs.nixpkgs-lock.outPath}"
92-
'';
90+
makeWrapperArgs = [ "--set NIX_PATH nixpkgs=${inputs.nixpkgs-lock.outPath}" ];
9391
extraBuildInputs = with inputs.nixpkgs; [
9492
alejandra
9593
nixUnstable
@@ -113,7 +111,7 @@ in
113111
name = "julia2nix-write-all-systems";
114112
runtimeInputs = [ cell.packages.build-project ];
115113
text = ''
116-
export NIX_PATH=${inputs.main.inputs.nixpkgs-lock.outPath}
114+
export NIX_PATH=${inputs.nixpkgs-lock.outPath}
117115
julia ${std.incl self [ "testenv" ]}/testenv/writejulia2nix.jl
118116
'';
119117
};

src/JuNix/util.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Prefetch sha256 with `nix-prefetch`
6464
function fetch_sha256(fetcher::Fetcher, opts::Options)
6565
parsed = parse_fetcher(fetcher, opts)
6666
expr = """
67-
let pkgs = import "/nix/store/cwr7p465zbfp60hg3jng1cfkmq14ka49-source" { };
67+
let pkgs = import <nixpkgs> { };
6868
in with pkgs; $(fetcher.name)
6969
"""
7070
cmd = `nix-prefetch $expr $(parsed)`

0 commit comments

Comments
 (0)