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: 0fc13aad1f0e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aaa1739e0a6f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 1, 2019

  1. blueman: no optional networkmanager 

    blueman declares NetworkManager gi bindings
as a required runtime dependency [0]

Fixes #69555

[0]: https://github.com/blueman-project/blueman/blob/531da47b06de3617492cc5ae5530ca8b3f2e12a4/Dependencies.md

(cherry picked from commit fcb84c5)
    @worldofpeace
    worldofpeace committed Oct 1, 2019
    Copy the full SHA
    aaa1739 View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 pkgs/tools/bluetooth/blueman/default.nix
9 changes: 3 additions & 6 deletions pkgs/tools/bluetooth/blueman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection
, withNetworkManager ?
config.networking.networkmanager.enable or false, networkmanager
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:

let
pythonPackages = python3Packages;
@@ -24,10 +22,9 @@ in stdenv.mkDerivation rec {
];

buildInputs = [ bluez gtk3 pythonPackages.python librsvg
gnome3.adwaita-icon-theme iproute libappindicator ]
gnome3.adwaita-icon-theme iproute libappindicator networkmanager ]
++ pythonPath
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withNetworkManager networkmanager;
++ lib.optional withPulseAudio libpulseaudio;

postPatch = lib.optionalString withPulseAudio ''
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py