public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pipewire: 0.1.9 -> 0.2.3

Browse Source 
I also removed pipewire from mutter temporarily, since it is not compatible.
This commit is contained in:
Tor Hedin Brønner 2018-08-20 17:03:55 +02:00 committed by Jan Tojnar
parent 56b9f6fc8e
commit c32b0409a9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-x" "--with-x"
"--disable-static" "--disable-static"
"--enable-remote-desktop" # "--enable-remote-desktop"
"--enable-shape" "--enable-shape"
"--enable-sm" "--enable-sm"
"--enable-startup-notification" "--enable-startup-notification"

14
pkgs/development/libraries/pipewire/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind { 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 , sbc, SDL2, makeFontsConf, freefont_ttf
}: }:
let let
version = "0.1.9"; version = "0.2.3";
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ]; fontDirectories = [ freefont_ttf ];
@ -16,22 +16,22 @@ in stdenv.mkDerivation rec {
owner = "PipeWire"; owner = "PipeWire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm"; sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "lib" "dev" "doc" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig doxygen graphviz valgrind meson ninja pkgconfig doxygen graphviz valgrind
]; ];
buildInputs = [ 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 alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
]; ];
mesonFlags = [ mesonFlags = [
"-Denable_docs=true" "-Ddocs=true"
"-Denable_gstreamer=true" "-Dgstreamer=true"
]; ];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";