From 38cda2ceb5890410fef9bf31d90566db4c7a74ad Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Wed, 2 Dec 2020 16:38:14 -0400 Subject: [PATCH 1/2] reduce the linux installer size some --- nix/cardano-bridge.nix | 11 +++++++++-- yarn2nix.nix | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nix/cardano-bridge.nix b/nix/cardano-bridge.nix index 116267c21b..e7109c994b 100644 --- a/nix/cardano-bridge.nix +++ b/nix/cardano-bridge.nix @@ -1,9 +1,9 @@ -{ target, pkgs, cardanoWalletPkgs, runCommand, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address }: +{ target, pkgs, cardanoWalletPkgs, runCommandCC, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address, stdenv, lib }: let commonLib = import ../lib.nix {}; pkgsCross = import cardanoWalletPkgs.path { crossSystem = cardanoWalletPkgs.lib.systems.examples.mingwW64; config = {}; overlays = []; }; -in runCommand "daedalus-cardano-bridge" { +in runCommandCC "daedalus-cardano-bridge" { passthru = { node-version = cardano-node.passthru.identifier.version; wallet-version = cardano-wallet.version; @@ -17,4 +17,11 @@ in runCommand "daedalus-cardano-bridge" { cp -f ${cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher}/bin/cardano-launcher* . cp -f ${cardano-node}/bin/cardano-node* . cp -f ${cardano-cli}/bin/cardano-cli* . + ${lib.optionalString (target == "x86_64-linux") '' + chmod +w -R . + for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do + $STRIP $x + patchelf --shrink-rpath $x + done + ''} '' diff --git a/yarn2nix.nix b/yarn2nix.nix index 5d59369b23..7e3b51e86f 100644 --- a/yarn2nix.nix +++ b/yarn2nix.nix @@ -170,6 +170,10 @@ yarn2nix.mkYarnPackage { mkdir -pv $out/share/daedalus/build cp node_modules/usb/build/Debug/usb_bindings.node $out/share/daedalus/build/usb_bindings.node cp node_modules/node-hid/build/Debug/HID-hidraw.node $out/share/daedalus/build/HID-hidraw.node + for file in $out/share/daedalus/build/usb_bindings.node $out/share/daedalus/build/HID-hidraw.node; do + $STRIP $file + patchelf --shrink-rpath $file + done ''; #allowedReferences = [ "out" ]; #allowedRequisites = [ From 1c0768b41af54021ae5468f67e27ee68ebe3d35d Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Thu, 3 Dec 2020 10:14:20 +0100 Subject: [PATCH 2/2] Adds CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c15d383a31..783d189c86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Changelog ## vNext +### Chores + +- Reduced the size of Linux installer ([PR 2260](https://github.com/input-output-hk/daedalus/pull/2260)) + ### Features - Added hardware wallet support for Testnet network ([PR 2264](https://github.com/input-output-hk/daedalus/pull/2264))