summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2018-08-20 17:03:55 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-09-14 05:09:00 +0200
commitc32b0409a9f1ba42dcf355838ab751390be55674 (patch)
tree2b653683be2e72fb1db2b5be859a2d417f0de71e /pkgs/development
parent56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833 (diff)
downloadnixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar.gz
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar.bz2
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar.lz
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar.xz
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.tar.zst
nixlib-c32b0409a9f1ba42dcf355838ab751390be55674.zip
pipewire: 0.1.9 -> 0.2.3
I also removed pipewire from mutter temporarily, since it is not compatible.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/pipewire/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index e87ed8e48a98..96b5239b7dbe 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf, freefont_ttf
 }:
 
 let
-  version = "0.1.9";
+  version = "0.2.3";
 
   fontsConf = makeFontsConf {
     fontDirectories = [ freefont_ttf ];
@@ -16,22 +16,22 @@ in stdenv.mkDerivation rec {
     owner = "PipeWire";
     repo = "pipewire";
     rev = version;
-    sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm";
+    sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "lib" "dev" "doc" ];
 
   nativeBuildInputs = [
     meson ninja pkgconfig doxygen graphviz valgrind
   ];
   buildInputs = [
-    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
+    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l
     alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
   ];
 
   mesonFlags = [
-    "-Denable_docs=true"
-    "-Denable_gstreamer=true"
+    "-Ddocs=true"
+    "-Dgstreamer=true"
   ];
 
   PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";