Skip to content

Commit 5ae0c44

Browse files
committed
fix: the Windows build of cardano-wallet
1 parent 1aa4f09 commit 5ae0c44

File tree

4 files changed

+22
-27
lines changed

4 files changed

+22
-27
lines changed

nix/internal/cardano-wallet--expose-musl64Packages.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/flake.nix b/flake.nix
2+
index 76b05e4d73..03fd75e9e7 100644
3+
--- a/flake.nix
4+
+++ b/flake.nix
5+
@@ -370,6 +370,7 @@
6+
tests = lib.collect lib.isDerivation windowsPackages.tests;
7+
benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
8+
};
9+
+ inherit windowsPackages;
10+
};
11+
}
12+
# macos is never cross-compiled
13+
@@ -434,6 +435,7 @@
14+
inherit pkgs;
15+
project = walletProject;
16+
};
17+
+ musl64Packages = mkPackages walletProject.projectCross.musl64;
18+
}) // {
19+
# Continuous integration builds
20+
ci.tests.all = pkgs.releaseTools.aggregate {

nix/internal/cardano-wallet--expose-windowsPackages.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

nix/internal/common.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ rec {
3333
cp -r ${unpatched} $out
3434
chmod -R +w $out
3535
cd $out
36-
patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
37-
patch -p1 -i ${./cardano-wallet--expose-musl64Packages.patch}
36+
patch -p1 -i ${./cardano-wallet--expose-packages.patch}
3837
'');
3938
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
4039
};
@@ -55,7 +54,7 @@ rec {
5554
}).defaultNix;
5655

5756
walletPackages = {
58-
x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
57+
x86_64-windows = walletFlake.packages.x86_64-linux.ci.artifacts.win64.windowsPackages;
5958
x86_64-linux = walletFlake.packages.x86_64-linux.musl64Packages;
6059
x86_64-darwin = walletFlake.packages.x86_64-darwin;
6160
aarch64-darwin = walletFlake.packages.aarch64-darwin;

0 commit comments

Comments
 (0)