From 728a4dae305fe245bdd08d3ee2e7748ea44744b1 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 10 Dec 2024 15:52:18 +0100 Subject: [PATCH] [LW-11965] Fix crashing of Daedalus 7.0.0 on Ubuntu --- CHANGELOG.md | 4 +++- nix/internal/cardano-bridge.nix | 2 +- .../cardano-wallet--expose-musl64Packages.patch | 12 ++++++++++++ nix/internal/common.nix | 3 ++- package.json | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 nix/internal/cardano-wallet--expose-musl64Packages.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ac8082a3d..7cb79b265e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/nix/internal/cardano-bridge.nix b/nix/internal/cardano-bridge.nix index 6ccf023956..ce4abd3944 100644 --- a/nix/internal/cardano-bridge.nix +++ b/nix/internal/cardano-bridge.nix @@ -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 diff --git a/nix/internal/cardano-wallet--expose-musl64Packages.patch b/nix/internal/cardano-wallet--expose-musl64Packages.patch new file mode 100644 index 0000000000..67485ebe3a --- /dev/null +++ b/nix/internal/cardano-wallet--expose-musl64Packages.patch @@ -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 { diff --git a/nix/internal/common.nix b/nix/internal/common.nix index 1a4408ca6b..f1af7a93eb 100644 --- a/nix/internal/common.nix +++ b/nix/internal/common.nix @@ -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; }; @@ -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}; diff --git a/package.json b/package.json index 1921fdfffb..94d6dd1054 100644 --- a/package.json +++ b/package.json @@ -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": {