diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-14 02:29:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 02:29:39 +0100 |
| commit | 44695e7045f9785c988ec8436b5806c753ed3bc2 (patch) | |
| tree | 4529f6937a25d8d9204af29138f50800b7886e97 /pkgs/desktops/gnome-3 | |
| parent | 8e6ea91496c0d2485a6c1972c1cdeba82689fff4 (diff) | |
| parent | dfe7a54d199173c1fc5037a28ac921049089b9f3 (diff) | |
| download | nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar.gz nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar.bz2 nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar.lz nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar.xz nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.tar.zst nixlib-44695e7045f9785c988ec8436b5806c753ed3bc2.zip | |
Merge pull request #34507 from jtojnar/pipewire
pipewire: init at 0.1.8
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 39b2438a8f02..e1343d9977d7 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, libgudev, libwacom, xwayland, autoreconfHook }: +, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" "--disable-static" + "--enable-remote-desktop" "--enable-shape" "--enable-sm" "--enable-startup-notification" @@ -18,6 +19,15 @@ stdenv.mkDerivation rec { "--with-xwayland-path=${xwayland}/bin/Xwayland" ]; + patches = [ + # Pipewire 0.1.8 compatibility + (fetchurl { + name = "mutter-pipewire-0.1.8-compat.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=367356; + sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz"; + }) + ]; + propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst @@ -30,7 +40,7 @@ stdenv.mkDerivation rec { gnome_desktop cairo pango cogl clutter zenity libstartup_notification gnome3.geocode_glib libinput libgudev libwacom libcanberra_gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon + libxkbcommon pipewire ]; preFixup = '' |