diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-07-10 22:20:52 +0200 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-07-10 23:13:54 +0200 |
commit | 6aa0a5d9d3c03264434f5159e87a8b773ce71fe3 (patch) | |
tree | b943586a3048552e907a4522cca996f7f1678b95 /pkgs/desktops/gnome-3 | |
parent | 0de3106a4b74d03d70d2110edd60feaf95d7678f (diff) | |
download | nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar.gz nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar.bz2 nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar.lz nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar.xz nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.tar.zst nixlib-6aa0a5d9d3c03264434f5159e87a8b773ce71fe3.zip |
libvte: fix .la file to include the libpath for ncurses
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.
Diffstat (limited to 'pkgs/desktops/gnome-3')
4 files changed, 26 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix index 541db5720db4..1b17cbc3d78d 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix @@ -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 ]; diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index d98ddc716dec..c916be6c9a72 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -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; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index a5b3fb739439..057ef191a6f4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -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 ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 53ce47cca54b..70c860849e08 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -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; }; } |