dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

network-manager-applet: re-do schema generation

Browse Source 
fixes #1355. partial revert of f4d4e12c (introduced by #1313).

meta.priority is set to 6 (lower priority than standard) to resolve the
conflict of an exported gschemas.compiled for evince as for nm-applet.
this linked file is NOT consulted, as both binaries are wrapped to look
for their schemas in their nix store path first.

a better fix would avoid already avoid linking those gschemas.compiled
files into the environment.
This commit is contained in:
Jonas Hoersch 2013-12-17 11:12:29 +01:00
parent 9131b45db4
commit 5125b98602
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\"''
];
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;
};
}