diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-06 12:51:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-06 12:51:56 +0100 |
commit | 99fb79ae843e9bc29513365e17418d4f1aee4ce0 (patch) | |
tree | 95fe1827d215ad2d101d15590332a8b46c09dc4c /pkgs/development/libraries/pipewire | |
parent | c7176d55ac8a801a0368014a3c76c4ebbd5eacaa (diff) | |
parent | da04a8e39741bbf336344b75b9842f2a7dc76ac1 (diff) | |
download | nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.gz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.bz2 nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.lz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.xz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.zst nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/pipewire')
-rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d8a58e6a8ea..858f2f94db2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.13"; + version = "0.3.15"; outputs = [ "out" @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w"; + sha256 = "1lmsn13pbr0cigb5ri9nd3102ffbaf8nsz5c8aawf6lsz7mhkx9x"; }; patches = [ @@ -65,13 +65,6 @@ stdenv.mkDerivation rec { ./alsa-profiles-use-libdir.patch # Move installed tests into their own output. ./installed-tests-path.patch - - # TODO Remove this on next update - # Fixes rpath referencecs. - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/2e3556fa128b778be62a7ffad5fbe78393035825.diff"; - sha256 = "039yysb8j1aiqml54rxnaqfmzqz1b6m8sv5w3vz52grvav3kyr1l"; - }) ]; nativeBuildInputs = [ |