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
base: 2383af82d416
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 59c3c4d6869e
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 24, 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.

(cherry picked from commit bdf6f85)
    @Yarny0 @xeji
    Yarny0 authored and xeji committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    59c3c4d View commit details
    Browse the repository at this point in the history