summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
diff options
context:
space:
mode:
authorAlexander Ried <ried@mytum.de>2016-09-29 14:20:14 +0200
committerAlexander Ried <ried@mytum.de>2016-10-15 20:32:11 +0200
commite4f816602c7a60392a8d73dc218aca3238acb739 (patch)
treec5a7cb5cf833d5772bc11b60d1e075d3ed5bec75 /pkgs/desktops/gnome-3/3.22/core/vte/default.nix
parentf1df7f2cbf18c967cb911af8ec30120bf59c738f (diff)
downloadnixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar.gz
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar.bz2
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar.lz
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar.xz
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.tar.zst
nixpkgs-e4f816602c7a60392a8d73dc218aca3238acb739.zip
gnome3_22.vte: remove selectTextPatch
Diffstat (limited to 'pkgs/desktops/gnome-3/3.22/core/vte/default.nix')
-rw-r--r--pkgs/desktops/gnome-3/3.22/core/vte/default.nix27
1 files changed, 4 insertions, 23 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
index 80699e21289..50aef658713 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, intltool, pkgconfig
 , gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
-
-, selectTextPatch ? false
-, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
+, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2
 }:
 
-let baseAttrs = rec {
+stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
                   gnome3.gtk3 ncurses vala_0_32 libxml2 ];
 
-  propagatedBuildInputs = [ gnutls ];
+  propagatedBuildInputs = [ gnutls pcre2 ];
 
   preConfigure = "patchShebangs .";
 
@@ -34,22 +32,5 @@ let baseAttrs = 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.4.a";
-      src = fetchFromGitHub {
-        owner = "thestinger";
-        repo = "vte-ng";
-        rev = version;
-        sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1";
-      };
-      # slightly hacky; I couldn't make it work with autoreconfHook
-      configureScript = "./autogen.sh";
-      nativeBuildInputs = (baseAttrs.nativeBuildInputs or [])
-        ++ [ gtk_doc autoconf automake libtool gperf ];
-  }
-)
+}