added cinnamon-session.nix

This commit is contained in:
Roelof Wobben 2013-12-08 21:40:52 +01:00
parent 11b337fc76
commit 23bacdf6ea
2 changed files with 9 additions and 11 deletions

View File

@ -1,5 +1,5 @@
{ 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, makeWrapper}: upower, json_glib,intltool, systemd, hicolor_icon_theme, cinnamon-session}:
let let
version = "2.0.6"; version = "2.0.6";
@ -21,19 +21,17 @@ stdenv.mkDerivation {
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 makeWrapper intltool systemd
]; ];
preBuild = "patchShebangs ./scripts"; preBuild = "patchShebangs ./scripts";
installPhase = ''
wrapProgram $out/bin/cinnamon-session \ postInstall = ''
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
''; rm $out/share/icons/hicolor/icon-theme.cache
'';
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = { meta = {
homepage = "http://cinnamon.linuxmint.com"; homepage = "http://cinnamon.linuxmint.com";
description = "the cinnamon session files " ; description = "the cinnamon session files " ;

View File

@ -9591,7 +9591,7 @@ let
callPackage = newScope pkgs.cinnamon; callPackage = newScope pkgs.cinnamon;
inherit (gnome3) gnome_common; inherit (gnome3) gnome_common;
cinnamon-session = callPackage ../desktop/cinnamon/cinnamon-session.nix{ } ; cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };