summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-12-28 23:50:27 +0100
committerGitHub <noreply@github.com>2020-12-28 23:50:27 +0100
commitfc6d7160695f0cda18f55183cc4da42b3e44841f (patch)
treece836fe9c0f679086ac9b14b46d18b08926f8e6d
parentc4b602ba4e7f0fe8fe509625da032f8fe4a29ec1 (diff)
parente128aa70f318bcb5de9f7b754acf68e98ad4897f (diff)
downloadnixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar.gz
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar.bz2
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar.lz
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar.xz
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.tar.zst
nixpkgs-fc6d7160695f0cda18f55183cc4da42b3e44841f.zip
Merge pull request #107818 from Emantor/topic/pavucontrol_wayland
pavucontrol: dropdown patch for wayland support
-rw-r--r--pkgs/applications/audio/pavucontrol/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 301e44168d3..f0a0956f662 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
-, libcanberra-gtk3, gnome3, wrapGAppsHook }:
+{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio,
+gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol";
@@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g";
   };
 
+  patches = [
+    # Can be removed with the next version bump
+    # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20
+    (fetchpatch {
+      name = "streamwidget-fix-drop-down-wayland.patch";
+      url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch";
+      sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj";
+  })];
+
   buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3
                   gnome3.adwaita-icon-theme ];