Merge pull request #3257 from input-output-hk/fix/LW-11965-ubuntu-crash

[LW-11965] Fix crashing of Daedalus 7.0.0 on Ubuntu
input-output-hk · Dec 10, 2024 · 28179e8 · 28179e8
2 parents f33865f + 728a4da
commit 28179e8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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": {