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

Commits on Apr 18, 2018

  1. network-manager-applet: add runtime dependency on gnome3.keyring 

    Closes #38967
    @obadz
    obadz committed Apr 18, 2018
    Copy the full SHA
    44c48fe View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/tools/networking/network-manager/applet.nix
5 changes: 4 additions & 1 deletion pkgs/tools/networking/network-manager/applet.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,10 @@ in stdenv.mkDerivation rec {

nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];

propagatedUserEnvPkgs = [ hicolor-icon-theme ];
propagatedUserEnvPkgs = [
hicolor-icon-theme
gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967
];

NIX_CFLAGS = [
''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''