alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libvte: fix .la file to include the libpath for ncurses

Browse source 
Without this patch, the .la file only added -lncurses without
specifying the nix store path, forcing the propagation
of ncurses as build input.

Also enable parallel building and add myself to the maintainers.
This commit is contained in:
Luca Bruno 2014-07-10 22:20:52 +02:00
parent 0de3106a4b
commit 6aa0a5d9d3
4 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
, desktop_file_utils, itstool, ncurses, makeWrapper }:
, desktop_file_utils, itstool, makeWrapper }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
gnome3.dconf gnome3.gconf itstool makeWrapper ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];

16
pkgs/desktops/gnome-3/3.10/core/vte/default.nix
View file

@ -15,9 +15,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = ''--enable-introspection'';
configureFlags = [ "--enable-introspection" ];
meta = {
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
'';
meta = with stdenv.lib; {
homepage = http://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK+";
longDescription = ''
@ -28,8 +34,8 @@ stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = "LGPLv2";
maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.linux;
};
}

4
pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, libuuid
, desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }:
, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
gnome3.dconf itstool ncurses makeWrapper gnome3.nautilus ];
gnome3.dconf itstool makeWrapper gnome3.nautilus ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];

16
pkgs/desktops/gnome-3/3.12/core/vte/default.nix
View file

@ -15,9 +15,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = ''--enable-introspection'';
configureFlags = [ "--enable-introspection" ];
meta = {
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
'';
meta = with stdenv.lib; {
homepage = http://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK+";
longDescription = ''
@ -28,8 +34,8 @@ stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = "LGPLv2";
maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.linux;
};
}