diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix index 3411633a289e..30b78ba143ad 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -1,5 +1,5 @@ { 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 version = "2.0.6"; @@ -21,19 +21,17 @@ stdenv.mkDerivation { pkgconfig autoreconfHook glib gettext gnome_common gtk3 dbus_glib upower json_glib - intltool systemd makeWrapper + intltool systemd ]; preBuild = "patchShebangs ./scripts"; - installPhase = '' - wrapProgram $out/bin/cinnamon-session \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" - ''; - - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; + + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + rm $out/share/icons/hicolor/icon-theme.cache + ''; + meta = { homepage = "http://cinnamon.linuxmint.com"; description = "the cinnamon session files " ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b72bf7ac221..b3c8b784406e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9591,7 +9591,7 @@ let callPackage = newScope pkgs.cinnamon; 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 { };