diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 22:46:34 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 22:46:34 +0100 |
commit | e215435378601f40cfe45ce357313259113dcd0b (patch) | |
tree | 6e6550be23007065e8fe24d11e92fea28e5a38ab /pkgs/desktops/cinnamon | |
parent | 1d62c6445fbcdf4b8d020ff94d143e875dfa5fd8 (diff) |
cinnamon-session: minor tweaks and make schemas available
Diffstat (limited to 'pkgs/desktops/cinnamon')
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-session.nix | 36 |
2 files changed, 24 insertions, 16 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix index d3cf04e835d1..e158b4898840 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation { xkeyboard_config libxkbfile libX11 libXrandr libXext ]; + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + meta = { homepage = "http://cinnamon.linuxmint.com"; description = "Library and data for various Cinnamon modules"; diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix index 30b78ba143ad..850dd4e6c5af 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -1,44 +1,48 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib, -upower, json_glib,intltool, systemd, hicolor_icon_theme, cinnamon-session}: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib +, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }: let version = "2.0.6"; in stdenv.mkDerivation { name = "cinnamon-session-${version}"; - + src = fetchurl { url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"; sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3"; }; - - - configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; - patches = [ ./remove-sessionmigration.patch ./timeout.patch]; + + configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; + + patches = [ ./remove-sessionmigration.patch ./timeout.patch]; buildInputs = [ pkgconfig autoreconfHook glib gettext gnome_common gtk3 dbus_glib upower json_glib - intltool systemd + intltool systemd xorg.xtrans + makeWrapper ]; preBuild = "patchShebangs ./scripts"; - + postInstall = '' - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + rm $out/share/icons/hicolor/icon-theme.cache + + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share" + done + ''; + + meta = { homepage = "http://cinnamon.linuxmint.com"; - description = "the cinnamon session files " ; + description = "The cinnamon session files" ; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roelof ]; }; } - |