From 6f64a7cf43c802b16a736fc705d8efeca2719a75 Mon Sep 17 00:00:00 2001 From: Oliver Hunt Date: Wed, 8 Oct 2014 18:18:37 +0200 Subject: [PATCH] Added granite Added meta details, changed hash to sha256, and added versions for granite Changed name to use versions Fixed license Yet another typo fix Added myself as maintainer and fixed typo Fixed maintainers Added pantheon terminal woops --- lib/maintainers.nix | 1 + .../apps/pantheon-terminal/default.nix | 32 +++++++++++++++++++ .../development/libraries/granite/default.nix | 21 ++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++ 4 files changed, 61 insertions(+) create mode 100644 pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix create mode 100644 pkgs/development/libraries/granite/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c75bfdc0c67..268a093c0579 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -138,6 +138,7 @@ viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; vlstill = "Vladimír Štill "; + vozz = "Oliver Hunt "; winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; wjlroe = "William Roe "; diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix new file mode 100644 index 000000000000..7506ece43dc1 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0.1"; + name = "pantheon-terminal-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; + sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za"; + }; + + preConfigure = '' + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig" + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper]; + meta = { + description = "elementary OS's terminal"; + longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; + homepage = https://launchpad.net/pantheon-terminal; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix new file mode 100644 index 000000000000..5a2ff5daa11b --- /dev/null +++ b/pkgs/development/libraries/granite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0"; + name = "granite-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; + sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { + description = "An extension to GTK+ used by elementary OS"; + longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + homepage = https://launchpad.net/granite; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 858c73ba53a1..5642a283bccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5204,6 +5204,8 @@ let else stdenv; }; + granite = callPackage ../development/libraries/granite { }; + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; }; @@ -11399,6 +11401,11 @@ let kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; }; + pantheon = recurseIntoAttrs rec { + callPackage = newScope pkgs.pantheon; + pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; + }; + redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm xf86vidmodeproto;