From 81460560c3114fd36e7e0249ce033c55003ca1a5 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 08:58:56 +0100 Subject: [PATCH] add cinnamon-desktop (close #1314) Reviewed and refactored by @vcunat. --- lib/maintainers.nix | 1 + pkgs/desktops/cinnamon/cinnamon-desktop.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-desktop.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ad110389f7a..4a1a3aa4106 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -49,6 +49,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; + roelof = "Roelof Wobben "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix new file mode 100644 index 00000000000..d3cf04e835d --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool +, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common +, xorg, xkeyboard_config +}: + +let + version = "2.0.4"; +in +stdenv.mkDerivation { + name = "cinnamon-desktop-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"; + sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with xorg; [ + pkgconfig autoreconfHook intltool + glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common + xkeyboard_config libxkbfile libX11 libXrandr libXext + ]; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "Library and data for various Cinnamon modules"; + + longDescription = '' + The libcinnamon-desktop library provides API shared by several applications + on the desktop, but that cannot live in the platform for various + reasons. There is no API or ABI guarantee, although we are doing our + best to provide stability. Documentation for the API is available with + gtk-doc. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59594cf2789..966d6c69f47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9526,6 +9526,10 @@ let cinnamon = recurseIntoAttrs { cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { + inherit (gnome3) gnome_common; + }; }; enlightenment = callPackage ../desktops/enlightenment { };