mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
* Gnome terminal.
svn path=/nixpkgs/trunk/; revision=8172
This commit is contained in:
parent
295990ca07
commit
7008d7bfd9
|
@ -3,7 +3,8 @@
|
|||
{ stdenv, fetchurl, pkgconfig, audiofile
|
||||
, flex, bison, popt, perl, zlib, libxml2, libxslt
|
||||
, perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
|
||||
, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib
|
||||
, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses
|
||||
, which, libxml2Python
|
||||
}:
|
||||
|
||||
assert dbus_glib.glib == gtkLibs.glib;
|
||||
|
@ -211,6 +212,18 @@ rec {
|
|||
gettext libxslt;
|
||||
input = desktop.gconfeditor;
|
||||
};
|
||||
|
||||
vte = import ./vte.nix {
|
||||
inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser ncurses
|
||||
python gettext;
|
||||
input = desktop.vte;
|
||||
};
|
||||
|
||||
gnometerminal = import ./gnome-terminal.nix {
|
||||
inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
|
||||
gettext which python libxml2Python libxslt;
|
||||
input = desktop.gnometerminal;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
, libxml2, libxslt, gettext
|
||||
}:
|
||||
|
||||
# !!! xml2po needs to store the path to libxml2
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (input) name src;
|
||||
|
||||
|
|
18
pkgs/desktops/gnome/gnome-terminal.nix
Normal file
18
pkgs/desktops/gnome/gnome-terminal.nix
Normal file
|
@ -0,0 +1,18 @@
|
|||
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
|
||||
, gettext, which, python, libxml2Python, libxslt
|
||||
}:
|
||||
|
||||
# !!! should get rid of libxml2Python, see gnomedocutils
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (input) name src;
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig perl perlXMLParser gnome.gtk gnome.GConf gnome.libglade
|
||||
gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte
|
||||
gnome.gnomedocutils gettext which gnome.scrollkeeper
|
||||
python libxml2Python libxslt
|
||||
];
|
||||
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
}
|
13
pkgs/desktops/gnome/vte.nix
Normal file
13
pkgs/desktops/gnome/vte.nix
Normal file
|
@ -0,0 +1,13 @@
|
|||
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
|
||||
, ncurses, python, gettext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (input) name src;
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ncurses];
|
||||
}
|
|
@ -1550,10 +1550,14 @@ rec {
|
|||
|
||||
libxml2 = import ../development/libraries/libxml2 {
|
||||
inherit fetchurl stdenv zlib python;
|
||||
# pythonSupport = stdenv.system == "i686-linux";
|
||||
pythonSupport = false;
|
||||
};
|
||||
|
||||
libxml2Python = import ../development/libraries/libxml2 {
|
||||
inherit fetchurl stdenv zlib python;
|
||||
pythonSupport = true;
|
||||
};
|
||||
|
||||
libxslt = import ../development/libraries/libxslt {
|
||||
inherit fetchurl stdenv libxml2;
|
||||
};
|
||||
|
@ -3017,7 +3021,7 @@ rec {
|
|||
flex bison popt zlib libxml2 libxslt
|
||||
perl perlXMLParser docbook_xml_dtd_42 gettext x11
|
||||
libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm
|
||||
python dbus_glib;
|
||||
python dbus_glib ncurses which libxml2Python;
|
||||
});
|
||||
|
||||
kdelibs = import ../desktops/kde/kdelibs {
|
||||
|
|
Loading…
Reference in a new issue