|
48 | 48 | }; |
49 | 49 | nixpkgsFor' = system: import nixpkgs { inherit system; }; |
50 | 50 |
|
51 | | - haskellModules = [ |
| 51 | + haskellModules = system: [ |
52 | 52 | ({ pkgs, ... }: |
53 | 53 | { |
54 | 54 | packages = { |
|
63 | 63 | }; |
64 | 64 | } |
65 | 65 | ) |
66 | | - ({ config, pkgs, system, ... }: { |
67 | | - packages.plutip-core.components.tests.plutip-tests = { |
68 | | - pkgconfig = [ [ pkgs.makeWrapper ] ]; |
69 | | - postInstall = with pkgs; '' |
70 | | - wrapProgram $out/bin/plutip-tests \ |
71 | | - --prefix PATH : "${lib.makeBinPath [ |
72 | | - cardano-node.packages.x86_64-darwin.cardano-node |
73 | | - cardano-node.packages.x86_64-darwin.cardano-cli |
74 | | - ]}" |
75 | | - ''; |
76 | | - }; |
77 | | - packages.plutip-core.components.exes.local-cluster = { |
78 | | - pkgconfig = [ [ pkgs.makeWrapper ] ]; |
79 | | - postInstall = with pkgs; '' |
80 | | - wrapProgram $out/bin/local-cluster \ |
81 | | - --prefix PATH : "${lib.makeBinPath [ |
82 | | - cardano-node.packages.x86_64-darwin.cardano-node |
83 | | - cardano-node.packages.x86_64-darwin.cardano-cli |
84 | | - ]}" |
85 | | - ''; |
86 | | - }; |
87 | | - }) |
| 66 | + ({ config, pkgs, ... }: |
| 67 | + let |
| 68 | + nodeExes = cardano-node.packages.${system}; |
| 69 | + in |
| 70 | + { |
| 71 | + packages.plutip-core.components.tests.plutip-tests = { |
| 72 | + pkgconfig = [ [ pkgs.makeWrapper ] ]; |
| 73 | + postInstall = with pkgs; '' |
| 74 | + wrapProgram $out/bin/plutip-tests \ |
| 75 | + --prefix PATH : "${lib.makeBinPath [ |
| 76 | + nodeExes.cardano-node |
| 77 | + nodeExes.cardano-cli |
| 78 | + ]}" |
| 79 | + ''; |
| 80 | + }; |
| 81 | + packages.plutip-core.components.exes.local-cluster = { |
| 82 | + pkgconfig = [ [ pkgs.makeWrapper ] ]; |
| 83 | + postInstall = with pkgs; '' |
| 84 | + wrapProgram $out/bin/local-cluster \ |
| 85 | + --prefix PATH : "${lib.makeBinPath [ |
| 86 | + nodeExes.cardano-node |
| 87 | + nodeExes.cardano-cli |
| 88 | + ]}" |
| 89 | + ''; |
| 90 | + }; |
| 91 | + }) |
88 | 92 | ]; |
89 | 93 |
|
90 | 94 | projectFor = system: |
|
124 | 128 | ]; |
125 | 129 | }; |
126 | 130 |
|
127 | | - modules = haskellModules; |
| 131 | + modules = haskellModules system; |
128 | 132 | }; |
129 | 133 | in |
130 | 134 | { |
131 | | - inherit haskellModules; |
132 | | - |
133 | 135 | project = perSystem projectFor; |
134 | 136 | flake = perSystem (system: (projectFor system).flake { }); |
135 | 137 |
|
|
183 | 185 | ''; |
184 | 186 | }); |
185 | 187 |
|
| 188 | + haskellModules = perSystem haskellModules; |
| 189 | + |
186 | 190 | # Instruction for the Hercules CI to build on x86_64-linux only, to avoid errors about systems without agents. |
187 | 191 | herculesCI.ciSystems = [ "x86_64-linux" ]; |
188 | 192 | }; |
|
0 commit comments