Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c51a4801f475
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b98d70f6121
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 17, 2019

  1. blueman: update patch 

    Fixes #71297
    @worldofpeace
    worldofpeace committed Oct 17, 2019
    Copy the full SHA
    6b98d70 View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 pkgs/tools/bluetooth/blueman/default.nix
11 changes: 8 additions & 3 deletions pkgs/tools/bluetooth/blueman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];
})
];