diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 15:54:11 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 15:57:41 +0100 |
commit | 45bf78373edb67b229ab9c087555b7a2d5a9d0a9 (patch) | |
tree | f9e734f71f0804d71b127f05fb04d4c7291bdeee /pkgs/desktops | |
parent | 5160c8887ee8b18955ff50fd7decd34a40a0356d (diff) |
termite: fix up the business with vte patching
I didn't see nice patches to apply, so I exchanged the whole source (-> autoreconf). /cc maintainer: k0ral. BTW, it's practical to have the maintainers attribute match the github name exactly so that people know how to /cc you.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/vte/default.nix | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix index b47381cf61b8f..86dfd953b48f3 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 -, gnutls, selectTextPatch ? false }: +{ stdenv, fetchurl, intltool, pkgconfig +, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +, selectTextPatch ? false +, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf +}: - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; +let baseAttrs = rec { + inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; propagatedBuildInputs = [ gnutls ]; @@ -36,4 +38,22 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl antono lethalman ]; platforms = platforms.linux; }; -} +}; + +in stdenv.mkDerivation ( baseAttrs + // stdenv.lib.optionalAttrs selectTextPatch rec { + name = "vte-ng-${version}"; + version = "0.42.1.a"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm"; + }; + # slightly hacky; I couldn't make it work with autoreconfHook + configureScript = "./autogen.sh"; + nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) + ++ [ gtk_doc autoconf automake libtool gperf ]; + } +) + |