Skip to content

Commit bfcd78f

Browse files
committed
nft-marketplace-frontend as flake input
1 parent 76ea0ae commit bfcd78f

File tree

4 files changed

+70
-90
lines changed

4 files changed

+70
-90
lines changed

arion-compose.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ in
3131
ports = [ "8080:80" ];
3232
volumes = [
3333
# "${toString ./.}/nft-marketplace/build:/usr/share/nginx/html"
34-
"${pkgs.nft-marketplace}/lib/node_modules/nft-marketplace/build:/usr/share/nginx/html"
34+
"${pkgs.nft-marketplace-frontend-artifacts}:/usr/share/nginx/html"
3535
"${toString ./.}/config/nginx.conf:/etc/nginx/nginx.conf"
3636
];
3737
healthcheck = {

flake.lock

Lines changed: 65 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,7 @@
1313
# inputs.nixpkgs.follows = "nixpkgs"; # TODO: should we follow this?
1414
};
1515

16-
dream2nix = {
17-
url = github:nix-community/dream2nix;
18-
inputs.nixpkgs.follows = "nixpkgs";
19-
};
20-
21-
22-
nft-marketplace = {
23-
url = github:mlabs-haskell/nft-marketplace;
24-
flake = false;
25-
};
16+
nft-marketplace-frontend.url = github:mlabs-haskell/nft-marketplace/aciceri/nix; # TODO: change to master once this is merged: https://github.com/mlabs-haskell/nft-marketplace/pull/224
2617

2718
nft-marketplace-server = {
2819
url = github:synthetica9/nft-marketplace-server/syn/fix-release;
@@ -43,19 +34,13 @@
4334
, nixpkgs
4435
, cardano-node
4536
, arion
37+
, nft-marketplace-frontend
4638
, nft-marketplace-server
4739
, ogmios-datum-cache
4840
, cardano-transaction-lib
49-
, dream2nix
5041
, ...
5142
} @ inputs:
5243
let
53-
nft-marketplace-flake = dream2nix.lib.makeFlakeOutputs {
54-
systems = supportedSystems;
55-
config.projectRoot = inputs.nft-marketplace;
56-
source = inputs.nft-marketplace;
57-
};
58-
5944
supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
6045

6146
perSystem = nixpkgs.lib.genAttrs supportedSystems;
@@ -78,7 +63,7 @@
7863
cardano-transaction-lib-server =
7964
cardano-transaction-lib.packages.${system}."cardano-browser-tx-server:exe:cardano-browser-tx-server";
8065

81-
inherit (nft-marketplace-flake.packages.${system}) nft-marketplace;
66+
nft-marketplace-frontend-artifacts = nft-marketplace-frontend.packages.${system}.default;
8267
};
8368

8469
pkgsFor = system:

overlay.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)