Skip to content

Commit 28179e8

Browse files
authored
Merge pull request #3257 from input-output-hk/fix/LW-11965-ubuntu-crash
[LW-11965] Fix crashing of Daedalus 7.0.0 on Ubuntu
2 parents f33865f + 728a4da commit 28179e8

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Changelog
22

3-
## vNext
3+
## 7.0.1
4+
5+
- Fixed crashing of Daedalus 7.0.0 on Ubuntu ([PR 3257](https://github.com/input-output-hk/daedalus/pull/3257))
46

57
## 7.0.0
68

nix/internal/cardano-bridge.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runCommandCC "daedalus-cardano-bridge" {
3333
''}
3434
${lib.optionalString (target == "x86_64-linux") ''
3535
chmod +w -R .
36-
for x in cardano-launcher cardano-wallet; do
36+
for x in cardano-launcher; do
3737
$STRIP $x
3838
patchelf --shrink-rpath $x
3939
done
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/flake.nix b/flake.nix
2+
index 2d680c2198..9888884449 100644
3+
--- a/flake.nix
4+
+++ b/flake.nix
5+
@@ -427,6 +427,7 @@
6+
project = walletProject;
7+
};
8+
windowsPackages = mkPackages walletProject.projectCross.mingwW64;
9+
+ musl64Packages = mkPackages walletProject.projectCross.musl64;
10+
}) // {
11+
# Continuous integration builds
12+
ci.tests.all = pkgs.releaseTools.aggregate {

nix/internal/common.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ rec {
3434
chmod -R +w $out
3535
cd $out
3636
patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
37+
patch -p1 -i ${./cardano-wallet--expose-musl64Packages.patch}
3738
'');
3839
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
3940
};
@@ -55,7 +56,7 @@ rec {
5556

5657
walletPackages = {
5758
x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
58-
x86_64-linux = walletFlake.packages.x86_64-linux;
59+
x86_64-linux = walletFlake.packages.x86_64-linux.musl64Packages;
5960
x86_64-darwin = walletFlake.packages.x86_64-darwin;
6061
aarch64-darwin = walletFlake.packages.aarch64-darwin;
6162
}.${targetSystem};

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "daedalus",
33
"productName": "Daedalus",
4-
"version": "7.0.0",
4+
"version": "7.0.1",
55
"description": "Cryptocurrency Wallet",
66
"main": "./dist/main/index.js",
77
"scripts": {

0 commit comments

Comments
 (0)