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

cinnamon-session: minor tweaks and make schemas available

Browse Source
This commit is contained in:
Vladimír Čunát 2013-12-10 22:46:34 +01:00
parent 1d62c6445f
commit e215435378
2 changed files with 24 additions and 16 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,6 +22,10 @@ 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";

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

@ -1,44 +1,48 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib, { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib
upower, json_glib,intltool, systemd, hicolor_icon_theme, cinnamon-session}: , upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }:
let let
version = "2.0.6"; version = "2.0.6";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cinnamon-session-${version}"; name = "cinnamon-session-${version}";
src = fetchurl { src = fetchurl {
url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"; url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz";
sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3"; 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 = [ buildInputs = [
pkgconfig autoreconfHook pkgconfig autoreconfHook
glib gettext gnome_common glib gettext gnome_common
gtk3 dbus_glib upower json_glib gtk3 dbus_glib upower json_glib
intltool systemd intltool systemd xorg.xtrans
makeWrapper
]; ];
preBuild = "patchShebangs ./scripts"; preBuild = "patchShebangs ./scripts";
postInstall = '' postInstall = ''
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ ${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
meta = { wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share"
done
'';
meta = {
homepage = "http://cinnamon.linuxmint.com"; homepage = "http://cinnamon.linuxmint.com";
description = "the cinnamon session files " ; description = "The cinnamon session files" ;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.roelof ]; maintainers = [ stdenv.lib.maintainers.roelof ];
}; };
} }