diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
| commit | dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907 (patch) | |
| tree | 3fb86f38ee7bb816ca0e57e6c035491cf7e09c29 /pkgs/servers | |
| parent | 9d6ac8eadaade4f8564aa54b64bb9eb0dabfa322 (diff) | |
| parent | 6521a83efe84a8c15b277e782700f4cf1936d3f9 (diff) | |
| download | nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.gz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.bz2 nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.lz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.xz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.zst nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/consul/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 86995f440040..ebc2685c122f 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -21,6 +21,10 @@ buildGoPackage rec { buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/consul + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = https://www.consul.io/; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ba514ccdbcbc..bd80560a0cb4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,18 +36,14 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "10.0"; + version = "11.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653"; + sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; }; - patches = [ ./caps-fix.patch ] - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { - url = "https://bugs.freedesktop.org/attachment.cgi?id=127889"; - sha256 = "063h5vmh4ykgxjbxyxjlj6qhyyxhazbh3p18p1ik69kq24nkny9m"; - }); + patches = [ ./caps-fix.patch ]; outputs = [ "out" "dev" ]; |