diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ef70a246..a91bc79180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ Changelog ========= -## vNext +## 3.0.0-FC3 + +### Features + +- Added hardware wallet support for "Ledger Nano S" and "Ledger Nano X" on Linux ([PR 2046](https://github.com/input-output-hk/daedalus/pull/2046)) ### Fixes diff --git a/default.nix b/default.nix index a5d543d9b4..9d605e2f02 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,6 @@ in { target ? builtins.currentSystem , nodeImplementation ? (getDefaultBackend cluster) , localLib ? import ./lib.nix { inherit nodeImplementation; } -, config ? {} , cluster ? "mainnet" , version ? "versionNotSet" , buildNum ? null @@ -28,6 +27,13 @@ let x86_64-windows = lib.systems.examples.mingwW64; }; system = systemTable.${target} or target; + config = { + packageOverrides = super: { + systemd = super.systemd.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ ./nix/systemd.patch ]; + }); + }; + }; pkgs = localLib.iohkNix.getPkgsDefault { inherit system config; }; pkgsNative = localLib.iohkNix.getPkgsDefault {}; sources = localLib.sources; diff --git a/nix/systemd.patch b/nix/systemd.patch new file mode 100644 index 0000000000..a78c42848d --- /dev/null +++ b/nix/systemd.patch @@ -0,0 +1,17 @@ +diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c +index fd5900704d..f9106fdbe5 100644 +--- a/src/libsystemd/sd-device/device-monitor.c ++++ b/src/libsystemd/sd-device/device-monitor.c +@@ -445,9 +445,9 @@ int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) { + "sd-device-monitor: No sender credentials received, message ignored."); + + cred = (struct ucred*) CMSG_DATA(cmsg); +- if (cred->uid != 0) +- return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), +- "sd-device-monitor: Sender uid="UID_FMT", message ignored.", cred->uid); ++ //if (cred->uid != 0) ++ // return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), ++ // "sd-device-monitor: Sender uid="UID_FMT", message ignored.", cred->uid); + + if (streq(buf.raw, "libudev")) { + /* udev message needs proper version magic */ diff --git a/package.json b/package.json index 66970c678d..5a2f3b0612 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "daedalus", "productName": "Daedalus", - "version": "3.0.0-FC2", + "version": "3.0.0-FC3", "description": "Cryptocurrency Wallet", "main": "./dist/main/index.js", "scripts": { diff --git a/source/renderer/app/config/hardwareWalletsConfig.js b/source/renderer/app/config/hardwareWalletsConfig.js index 6300e4c82f..9191718152 100644 --- a/source/renderer/app/config/hardwareWalletsConfig.js +++ b/source/renderer/app/config/hardwareWalletsConfig.js @@ -1,4 +1,4 @@ -const { isMainnet, isLinux } = global.environment; +const { isMainnet } = global.environment; export const HARDENED_HEX = 0x80000000; export const HARDENED = 2147483648; @@ -56,7 +56,7 @@ export const MINIMAL_LEDGER_FIRMWARE_VERSION = '1.6.1'; export const MINIMAL_TREZOR_FIRMWARE_VERSION = '2.3.3'; export const isTrezorEnabled = true; -export const isLedgerEnabled = !isLinux; +export const isLedgerEnabled = true; export const isHardwareWalletSupportEnabled = isMainnet && (isTrezorEnabled || isLedgerEnabled);