diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-22 07:28:10 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-22 07:28:10 -0400 |
| commit | d0a8866622066a0abe9a95e444676d283580dc37 (patch) | |
| tree | d9f6b2568aecaa32a679ea72676eeba3d3d28361 /pkgs/servers | |
| parent | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (diff) | |
| parent | 31119d3ef68c515e857cf192e2c87e1b77d63a78 (diff) | |
| download | nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar.gz nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar.bz2 nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar.lz nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar.xz nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.tar.zst nixpkgs-d0a8866622066a0abe9a95e444676d283580dc37.zip | |
Merge branch 'binutils-2.30' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
2 files changed, 10 insertions, 1 deletions
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"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 13fbf7b6791..064c43b35ea 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 }; |