mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-21 03:25:36 +00:00
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.
This commit is contained in:
parent
5160c8887e
commit
45bf78373e
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, pkgconfig, vte, gtk, ncurses }:
|
||||
{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "termite-${version}";
|
||||
@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2";
|
||||
};
|
||||
|
||||
makeFlags = "VERSION=v${version}";
|
||||
makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ];
|
||||
|
||||
buildInputs = [pkgconfig vte gtk ncurses];
|
||||
|
||||
installFlags = "PREFIX=$(out)";
|
||||
buildInputs = [ pkgconfig vte gtk3 ncurses ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple VTE-based terminal";
|
||||
|
@ -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 {
|
||||
, selectTextPatch ? false
|
||||
, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
|
||||
}:
|
||||
|
||||
let baseAttrs = rec {
|
||||
inherit (import ./src.nix fetchurl) name src;
|
||||
|
||||
patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
|
||||
|
||||
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 ];
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -13357,9 +13357,8 @@ let
|
||||
};
|
||||
|
||||
termite = callPackage ../applications/misc/termite {
|
||||
gtk = gtk3;
|
||||
vte = gnome3.vte-select-text;
|
||||
};
|
||||
};
|
||||
|
||||
tesseract = callPackage ../applications/graphics/tesseract { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user