Merge pull request #205193 from flokli/ledger-live-desktop-fix-build
ledger-live-desktop: fix build
This commit is contained in:
commit
09598b218e
2 changed files with 0 additions and 26 deletions
|
@ -12,22 +12,10 @@ let
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
inherit pname version src;
|
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
|
in
|
||||||
appimageTools.wrapType2 rec {
|
appimageTools.wrapType2 rec {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: [ systemdPatched ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||||
install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
|
install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
|
||||||
|
|
|
@ -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 */
|
|
Loading…
Reference in a new issue