mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #1391 from coroa/nm-applet
network-manager-applet: re-do schema generation
This commit is contained in:
commit
ef406e0bb6
@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
|
||||
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
rm $out/share/glib-2.0/schemas/gschemas.compiled'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/NetworkManager/VPN
|
||||
ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
|
||||
@ -62,5 +59,9 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ phreedom urkud rickynils ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
# resolve collision between evince and nm-applet for
|
||||
# gschemas.compiled
|
||||
priority = 6;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user