alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #1391 from coroa/nm-applet

Browse source 
network-manager-applet: re-do schema generation
This commit is contained in:
Domen Kožar 2014-01-02 12:20:29 -08:00
commit ef406e0bb6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/networking/network-manager-applet/default.nix
View file

@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ''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 = '' postInstall = ''
mkdir -p $out/etc/NetworkManager/VPN 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 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; license = licenses.gpl2;
maintainers = with maintainers; [ phreedom urkud rickynils ]; maintainers = with maintainers; [ phreedom urkud rickynils ];
platforms = platforms.linux; platforms = platforms.linux;
# resolve collision between evince and nm-applet for
# gschemas.compiled
priority = 6;
}; };
} }