public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cinnamon: fixup gschemas

Browse Source
This commit is contained in:
Vladimír Čunát 2014-04-06 21:20:23 +02:00
parent 43dc48845b
commit 2b8002e44b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/cinnamon/cinnamon-desktop.nix
View File

@ -22,10 +22,6 @@ stdenv.mkDerivation {
xkeyboard_config libxkbfile libX11 libXrandr libXext xkeyboard_config libxkbfile libX11 libXrandr libXext
]; ];
postInstall = ''
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
'';
meta = { meta = {
homepage = "http://cinnamon.linuxmint.com"; homepage = "http://cinnamon.linuxmint.com";
description = "Library and data for various Cinnamon modules"; description = "Library and data for various Cinnamon modules";

8
pkgs/desktops/cinnamon/cinnamon-session.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; configureFlags = "--enable-systemd --disable-gconf" ;
patches = [ ./remove-sessionmigration.patch ./timeout.patch]; patches = [ ./remove-sessionmigration.patch ./timeout.patch];
@ -23,17 +23,17 @@ stdenv.mkDerivation {
gtk3 dbus_glib upower json_glib gtk3 dbus_glib upower json_glib
intltool systemd xorg.xtrans intltool systemd xorg.xtrans
makeWrapper makeWrapper
cinnamon-desktop/*gschemas*/
]; ];
preBuild = "patchShebangs ./scripts"; preBuild = "patchShebangs ./scripts";
postInstall = '' postFixup = ''
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/icons/hicolor/icon-theme.cache
for f in "$out"/bin/*; do for f in "$out"/bin/*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share" wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas:$GSETTINGS_SCHEMAS_PATH"
done done
''; '';