diff options
author | edef <edef@edef.eu> | 2022-12-09 15:57:01 +0000 |
---|---|---|
committer | edef <edef@edef.eu> | 2022-12-09 15:57:01 +0000 |
commit | 26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e (patch) | |
tree | 50a6d2a9188f5417f0cd3545d88d55c27ebc201c | |
parent | bf76dcab50dcc2f3e663637839ff1e551f537173 (diff) | |
download | nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar.gz nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar.bz2 nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar.lz nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar.xz nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.tar.zst nixpkgs-26e5aab82f5f460a5c1ac95fbf48f5662ae9f94e.zip |
ledger-live-desktop: drop systemd override
systemd v252 has loosened the relevant check when in a user namespace, so the patch is no longer necessary. The AppImage runtime FHS provides libudev and libsystemd, so we don't need to provide our own anymore. Change-Id: Iee2bb2dffb390c2190f7fe0115e91436999a609d
-rw-r--r-- | pkgs/applications/blockchains/ledger-live-desktop/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/blockchains/ledger-live-desktop/systemd.patch | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 3bed576e5db..86815bd55ba 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -12,22 +12,10 @@ let appimageContents = appimageTools.extractType2 { inherit pname version src; }; - - # Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a - # special socket, to every libudev client listening for hotplug when the kernel does that. It will - # try to preserve the uid of the sender but a non-root namespace (like the fhs-env) cant map root - # to a uid, for security reasons, so the uid of the sender becomes nobody and libudev actively - # rejects such messages. This patch disables that bit of security in libudev. - # See: https://github.com/NixOS/nixpkgs/issues/116361 - systemdPatched = systemd.overrideAttrs ({ patches ? [ ], ... }: { - patches = patches ++ [ ./systemd.patch ]; - }); in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: [ systemdPatched ]; - extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop diff --git a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch b/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch deleted file mode 100644 index a70053d7118..00000000000 --- a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -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,6 @@ 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 (streq(buf.raw, "libudev")) { - /* udev message needs proper version magic */ |