Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LW-11965] Fix crashing of Daedalus 7.0.0 on Ubuntu #3257

Merged
merged 1 commit into from
Dec 10, 2024
+19 −4
Merged

[LW-11965] Fix crashing of Daedalus 7.0.0 on Ubuntu #3257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## vNext
## 7.0.1

- Fixed crashing of Daedalus 7.0.0 on Ubuntu ([PR 3257](https://github.com/input-output-hk/daedalus/pull/3257))

## 7.0.0

Expand Down
2 changes: 1 addition & 1 deletion nix/internal/cardano-bridge.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runCommandCC "daedalus-cardano-bridge" {
''}
${lib.optionalString (target == "x86_64-linux") ''
chmod +w -R .
for x in cardano-launcher cardano-wallet; do
for x in cardano-launcher; do
$STRIP $x
patchelf --shrink-rpath $x
done
Expand Down
12 changes: 12 additions & 0 deletions nix/internal/cardano-wallet--expose-musl64Packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/flake.nix b/flake.nix
index 2d680c2198..9888884449 100644
--- a/flake.nix
+++ b/flake.nix
@@ -427,6 +427,7 @@
project = walletProject;
};
windowsPackages = mkPackages walletProject.projectCross.mingwW64;
+ musl64Packages = mkPackages walletProject.projectCross.musl64;
}) // {
# Continuous integration builds
ci.tests.all = pkgs.releaseTools.aggregate {
3 changes: 2 additions & 1 deletion nix/internal/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ rec {
chmod -R +w $out
cd $out
patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
patch -p1 -i ${./cardano-wallet--expose-musl64Packages.patch}
'');
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
};
Expand All @@ -55,7 +56,7 @@ rec {

walletPackages = {
x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
x86_64-linux = walletFlake.packages.x86_64-linux;
x86_64-linux = walletFlake.packages.x86_64-linux.musl64Packages;
x86_64-darwin = walletFlake.packages.x86_64-darwin;
aarch64-darwin = walletFlake.packages.aarch64-darwin;
}.${targetSystem};
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "daedalus",
"productName": "Daedalus",
"version": "7.0.0",
"version": "7.0.1",
"description": "Cryptocurrency Wallet",
"main": "./dist/main/index.js",
"scripts": {
Expand Down
Loading