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

Commits on Aug 1, 2018

  1. plasma-nm: fix path to mobile broadband provider file (#44302) 

    When creating a new mobile broadband connection
with the plasma network manager connection editor,
it tries to find a file containing provider
information somewhere in /usr/share/... .
The build recipe contains a patch to fix the lookup path
such that it finds the file in the corresponding package,
probably added due to
#9389 .
The actual lookup path is injected into
the patch file with substituteAll.

With commit a31d98f ,
the variable name used in subsituteAll changed from
mobile_broadband_provider_info to mobile-broadband-provider-info
(underscores in package names turned into dashes).
Apparently, substituteAll can't handle dashes in variable names.
Consequently, the variable name was no longer resolved.
plasma-nm failed to create new mobile broadband connections;
the connection creator silently exited and logged the error
> plasma-nm: Error opening providers file "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"

This commit keeps the dashes in package names, but it
restores the underscores in the variable used by substituteAll,
thereby ensuring the variable gets resolved properly.
    @Yarny0 @xeji
    Yarny0 authored and xeji committed Aug 1, 2018
    Copy the full SHA
    bdf6f85 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
  2. +1 −1 pkgs/desktops/plasma-5/plasma-nm/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ index 568cb34..98a5992 100644
#include <KLocale>

-const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
+const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml";
+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";

bool localeAwareCompare(const QString & one, const QString & two) {
return one.localeAwareCompare(two) < 0;
2 changes: 1 addition & 1 deletion pkgs/desktops/plasma-5/plasma-nm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ mkDerivation {
patches = [
(substituteAll {
src = ./0001-mobile-broadband-provider-info-path.patch;
inherit mobile-broadband-provider-info;
mobile_broadband_provider_info = mobile-broadband-provider-info;
})
(substituteAll {
src = ./0002-openvpn-binary-path.patch;