summary refs log tree commit diff
path: root/pkgs/tools/bluetooth
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-10-17 16:56:41 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-10-17 16:56:41 -0400
commit6b98d70f61219e32efbab3e6658608b286fc5756 (patch)
tree851c4ebfff63228318d9e71eac9c4b5945431bca /pkgs/tools/bluetooth
parentc51a4801f47512402e7d6ea2ba67b9ff405d34dc (diff)
downloadnixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar.gz
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar.bz2
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar.lz
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar.xz
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.tar.zst
nixpkgs-6b98d70f61219e32efbab3e6658608b286fc5756.zip
blueman: update patch
Fixes #71297
Diffstat (limited to 'pkgs/tools/bluetooth')
-rw-r--r--pkgs/tools/bluetooth/blueman/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 16b7d21e2bd..1a7fb5c3a08 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,6 @@
 { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
 , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
-, gnome3, librsvg, wrapGAppsHook, gobject-introspection
+, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
 , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
 
 let
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     gobject-introspection intltool pkgconfig pythonPackages.cython
     pythonPackages.wrapPython wrapGAppsHook
+    autoreconfHook # drop when below patch is removed
   ];
 
   buildInputs = [ bluez gtk3 pythonPackages.python librsvg
@@ -29,8 +30,12 @@ in stdenv.mkDerivation rec {
   patches = [
     # Don't use etc/dbus-1/system.d
     (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/blueman-project/blueman/pull/1103.patch";
-      sha256 = "0zqdi6ya97jljwinn10n9q6bixl23ww55c0pkhskn140qnrj42wf";
+      url = "https://github.com/blueman-project/blueman/commit/ae2be5a70cdea1d1aa0e3ab1c85c1d3a0c4affc6.patch";
+      sha256 = "0nb6jzlxhgjvac52cjwi0pi40b8v4h6z6pwz5vkyfmaj86spygg3";
+      excludes = [
+        "meson.build"
+        "Dependencies.md"
+      ];
     })
   ];