pyrox.dev / nixpkgs
lol
fork atom

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
https://github.com/NixOS/nixpkgs/issues/9389 .
The actual lookup path is injected into
the patch file with substituteAll.

With commit a31d98f3120e0f676303b7fc3e84424e6b325290 ,
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 bdf6f852 4f505d72

options
unified split
Changed files
+2 -2
pkgs
desktops
plasma-5
plasma-nm
0001-mobile-broadband-provider-info-path.patch
default.nix
+1 -1
pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch 
···

       
16

       
16

       
 

       
 #include <KLocale>


     

       
17

       
17

       
 

       
 


     

       
18

       
18

       
 

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


     

       
19

       

       
-

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


     

       

       
19

       
+

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


     

       
20

       
20

       
 

       
 


     

       
21

       
21

       
 

       
 bool localeAwareCompare(const QString & one, const QString & two) {


     

       
22

       
22

       
 

       
     return one.localeAwareCompare(two) < 0;
+1 -1
pkgs/desktops/plasma-5/plasma-nm/default.nix 
···

       
21

       
21

       
 

       
  patches = [


     

       
22

       
22

       
 

       
    (substituteAll {


     

       
23

       
23

       
 

       
      src = ./0001-mobile-broadband-provider-info-path.patch;


     

       
24

       

       
-

       
      inherit mobile-broadband-provider-info;


     

       

       
24

       
+

       
      mobile_broadband_provider_info = mobile-broadband-provider-info;


     

       
25

       
25

       
 

       
    })


     

       
26

       
26

       
 

       
    (substituteAll {


     

       
27

       
27

       
 

       
      src = ./0002-openvpn-binary-path.patch;