From 0f172e971c0919f831f665e40dfbe503bffb618e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 05:50:35 -0500 Subject: libxshmfence: Bump to 1.3. Needed with glibc-2.27. --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/servers') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 18189ba2e68..02e5a29a8f6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -271,6 +271,11 @@ in }; libxshmfence = attrs: attrs // { + name = "libxshmfence-1.3"; + src = args.fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; + }; outputs = [ "out" "dev" ]; # mainly to avoid propagation }; -- cgit 1.4.1 From 88d10c7f1d2c3406739e9abaef710ca91af31a63 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 07:30:01 -0500 Subject: libpulseaudio: Add upstream glibc 2.27-compat patch --- pkgs/servers/pulseaudio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 6a65e8d0320..ed4a8889c67 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,7 +43,11 @@ stdenv.mkDerivation rec { sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; - patches = [ ./caps-fix.patch ] + patches = [ ./caps-fix.patch (fetchpatch { + name = "glibc-2.27.patch"; + url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; + sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; + }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "padsp-fix.patch"; url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; -- cgit 1.4.1