diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-01 00:58:38 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-02 23:39:19 +0200 |
| commit | a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15 (patch) | |
| tree | e5f48d318f5a5f622a2789efa9cea71c3aa2042f /pkgs/os-specific | |
| parent | 5824b9c0e74ef585ab75ba2174c8e3108bfd2909 (diff) | |
| download | nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar.gz nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar.bz2 nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar.lz nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar.xz nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.tar.zst nixlib-a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15.zip | |
systemd: apply patch to fix #18158
See: - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834367 - https://github.com/systemd/systemd/issues/3842
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index eff515c3dad1..d02f7291df52 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { sha256 = "021b7filp1dlhic1iv54b821w7mj5595njvzns939pmn636ry4m5"; }; + patches = [ + # Fixes tty issues, see #18158. Remove when upgrading to systemd 232. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch"; + sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm"; + }) + ]; + /* gave up for now! outputs = [ "out" "libudev" "doc" ]; # maybe: "dev" # note: there are many references to ${systemd}/... |