Merge pull request #4426 from ollieh/master

Added granite and pantheon-terminal
This commit is contained in:
Pascal Wittmann 2014-10-09 12:39:09 +02:00
commit 13048b252f
4 changed files with 61 additions and 0 deletions

View File

@ -138,6 +138,7 @@
viric = "Lluís Batlle i Rossell <viric@viric.name>";
vizanto = "Danny Wilson <danny@prime.vc>";
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
wjlroe = "William Roe <willroe@gmail.com>";

View File

@ -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 ];
};
}

View File

@ -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 ];
};
}

View File

@ -5206,6 +5206,8 @@ let
else stdenv;
};
granite = callPackage ../development/libraries/granite { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or stdenv.isLinux;
};
@ -11401,6 +11403,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;