Skip to content

Commit e0d57ee

Browse files
author
jared
committed
Changed relative paths in typescript nix expressions to point to the derivations in the nix store instead.
1 parent 06a6b46 commit e0d57ee

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

extras/lbf-nix/lbf-plutus-typescript.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ let
1515
imports = {
1616
default = { };
1717
override = libs: libs // {
18-
lbf-prelude = ../../libs/lbf-prelude;
19-
lbf-plutus = ../../libs/lbf-plutus;
18+
lbf-prelude = "${config.packages.lbf-prelude}";
19+
lbf-plutus = "${config.packages.lbf-plutus}";
2020
};
2121
};
2222
npmExtraDependencies = {
@@ -31,7 +31,10 @@ let
3131
};
3232
configs = {
3333
default = [ ];
34-
override = _: [ ../../lambda-buffers-codegen/data/typescript-prelude-base.json ../../lambda-buffers-codegen/data/typescript-plutus.json ];
34+
override = _: [
35+
"${config.packages.codegen-configs}/typescript-prelude-base.json"
36+
"${config.packages.codegen-configs}/typescript-plutus.json"
37+
];
3538
};
3639
}
3740
lbfTypescriptOpts;

extras/lbf-nix/lbf-prelude-typescript.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let
1818
{
1919
imports = {
2020
default = { };
21-
override = libs: libs // { lbf-prelude = ../../libs/lbf-prelude; };
21+
override = libs: libs // { lbf-prelude = "${config.packages.lbf-prelude}"; };
2222
};
2323
npmExtraDependencies = {
2424
default = [ ];
@@ -33,7 +33,9 @@ let
3333
};
3434
configs = {
3535
default = [ ];
36-
override = cfgs: cfgs ++ [ ../../lambda-buffers-codegen/data/typescript-prelude-base.json ];
36+
override = cfgs: cfgs ++ [
37+
"${config.packages.codegen-configs}/typescript-prelude-base.json"
38+
];
3739
};
3840
}
3941
lbfTypeScriptOpts;

extras/lbf-nix/lbf-typescript.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lbfTypescriptOpts@{
1717
# Examples: src = ./api
1818
src
1919
, # Additional sources that are passed to `lbf` as the `--import-path` flag
20-
# Examples: imports = { "lbf-prelude" = ./lbf-prelude; "my-package-name" = ./path/to/my-package-name; }
20+
# Examples: imports = { "lbf-prelude" = "./lbf-prelude"; "my-package-name" = "./path/to/my-package-name"; }
2121
imports ? { }
2222
, # .lbf files in `src` to compile and codegen.
2323
# Examples: files = [ "Foo.lbf" "Foo/Bar.lbf" ]
@@ -41,12 +41,12 @@ lbfTypescriptOpts@{
4141
let
4242
lbf-build = import ./lbf-build.nix pkgs lbf;
4343

44-
# TODO(jaredponn): this was stolen from the Rust side. This should be made a
45-
# common function.
44+
# TODO(jaredponn): this was (essentially) stolen from the Rust side. This
45+
# should be made a common function.
4646
findModules = root: builtins.map
4747
(path: builtins.replaceStrings [ "/" ] [ "." ]
4848
(pkgs.lib.strings.removePrefix "./" (pkgs.lib.strings.removeSuffix ".lbf"
49-
(pkgs.lib.path.removePrefix root path))))
49+
(pkgs.lib.strings.removePrefix root path))))
5050
(builtins.filter (pkgs.lib.hasSuffix ".lbf")
5151
(pkgs.lib.filesystem.listFilesRecursive root));
5252

0 commit comments

Comments
 (0)