diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/development/libraries/pipewire | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pipewire')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/pipewire/0.2.nix (renamed from nixpkgs/pkgs/development/libraries/pipewire/2.nix) | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/pipewire/default.nix | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pipewire/2.nix b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix index e9656ee23ec5..1dbfe0647f47 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/2.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index f9cc7b56fff0..21dcf5af3159 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -10,7 +11,7 @@ , dbus , gst_all_1 , alsaLib -, ffmpeg +, ffmpeg_3 , libjack2 , udev , libva @@ -32,7 +33,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -41,9 +42,16 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; + sha256 = "0g149vyaigf4gzm764fcgxxci9niw19z0af9afs4diwq5xzr1qd3"; }; + patches = [ (fetchpatch { + # Brought by https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/263, + # should be part of > 0.3.6 + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d1162f28efd502fcb973e172867970f5cc8d7a6b.patch"; + sha256 = "0ng34yin5726cvv0nll1b2xigyq6mj6j516l3xi0ys1i2g2fyby9"; + })]; + nativeBuildInputs = [ doxygen graphviz @@ -58,7 +66,7 @@ stdenv.mkDerivation rec { alsaLib bluez dbus - ffmpeg + ffmpeg_3 glib gst_all_1.gst-plugins-base gst_all_1.gstreamer |