gnome: use callPackage, move to gnome-2
gnome28 was a mix of packages from various releases, so do not mention 2.28 in the attribute name. svn path=/nixpkgs/trunk/; revision=29721
This commit is contained in:
parent
a2d0e3b739
commit
e60fe8673b
|
@ -1,338 +0,0 @@
|
|||
pkgs:
|
||||
pkgs.makeOverridable
|
||||
(__overrides: rec {
|
||||
inherit __overrides;
|
||||
|
||||
inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
|
||||
|
||||
# Backward compatibility.
|
||||
startupnotification = startup_notification;
|
||||
gnomedocutils = gnome_doc_utils;
|
||||
gnomeicontheme = gnome_icon_theme;
|
||||
gnomepanel = gnome_panel;
|
||||
|
||||
#### PLATFORM
|
||||
|
||||
audiofile = import ./platform/audiofile {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
};
|
||||
|
||||
esound = import ./platform/esound {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig alsaLib;
|
||||
inherit audiofile;
|
||||
};
|
||||
|
||||
libIDL = import ./platform/libIDL {
|
||||
inherit (pkgs) stdenv fetchurl flex bison pkgconfig;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null;
|
||||
};
|
||||
|
||||
ORBit2 = import ./platform/ORBit2 {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit libIDL;
|
||||
};
|
||||
|
||||
libart_lgpl = import ./platform/libart_lgpl {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
};
|
||||
|
||||
libglade = import ./platform/libglade {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgnomeprint = import ./platform/libgnomeprint {
|
||||
inherit intltool libart_lgpl libgnomecups;
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgnomeprintui = import ./platform/libgnomeprintui {
|
||||
inherit intltool libgnomecanvas libgnomeprint gnomeicontheme;
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgnomecups = import ./platform/libgnomecups {
|
||||
inherit intltool libart_lgpl;
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
libgtkhtml = import ./platform/libgtkhtml {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
intltool = import ./platform/intltool {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext;
|
||||
};
|
||||
|
||||
GConf = import ./platform/GConf {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool ORBit2;
|
||||
dbus_libs = pkgs.dbus.libs;
|
||||
};
|
||||
|
||||
libgnomecanvas = import ./platform/libgnomecanvas {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit intltool libart_lgpl libglade;
|
||||
};
|
||||
|
||||
libgnomecanvasmm = import ./platform/libgnomecanvasmm {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig;
|
||||
inherit libgnomecanvas gtkmm;
|
||||
};
|
||||
|
||||
# for git-head builds
|
||||
gnome_common = import platform/gnome-common {
|
||||
inherit (pkgs) stdenv fetchgit pkgconfig
|
||||
autoconf automake libtool;
|
||||
};
|
||||
|
||||
gnome_mime_data = import ./platform/gnome-mime-data {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
inherit intltool;
|
||||
};
|
||||
|
||||
gnome_vfs = import ./platform/gnome-vfs {
|
||||
inherit (pkgs) stdenv fetchurl_gnome pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool GConf gnome_mime_data;
|
||||
};
|
||||
|
||||
gnome_vfs_monikers = import ./platform/gnome-vfs-monikers {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool gnome_vfs libbonobo ORBit2;
|
||||
};
|
||||
|
||||
libgnome = import ./platform/libgnome {
|
||||
inherit (pkgs) stdenv fetchurl_gnome libcanberra pkgconfig popt zlib libtool;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool libbonobo GConf gnome_vfs ORBit2;
|
||||
};
|
||||
|
||||
libgnomeui = import ./platform/libgnomeui {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs;
|
||||
inherit intltool libgnome libgnomecanvas libbonoboui GConf;
|
||||
inherit gnome_vfs gnome_keyring libglade glib pango;
|
||||
};
|
||||
|
||||
libbonobo = import ./platform/libbonobo {
|
||||
inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool ORBit2;
|
||||
};
|
||||
|
||||
libbonoboui = import ./platform/libbonoboui {
|
||||
inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2;
|
||||
inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk;
|
||||
};
|
||||
|
||||
at_spi = import ./platform/at-spi {
|
||||
inherit (pkgs) stdenv fetchurl python pkgconfig popt;
|
||||
inherit (pkgs.xlibs) libX11 libICE libXtst libXi;
|
||||
inherit (pkgs.gtkLibs) atk gtk;
|
||||
inherit intltool libbonobo ORBit2;
|
||||
};
|
||||
|
||||
glib_networking = import ./platform/glib-networking {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
|
||||
libproxy libgcrypt libtasn1;
|
||||
};
|
||||
|
||||
gtk_doc = import ./platform/gtk-doc {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt;
|
||||
inherit (pkgs) docbook_xml_dtd_43 docbook_xsl dblatex;
|
||||
inherit gnome_doc_utils;
|
||||
};
|
||||
|
||||
# What name should we use??
|
||||
gtkdoc = gtk_doc;
|
||||
|
||||
gtkhtml = import ./platform/gtkhtml {
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes;
|
||||
inherit GConf gnome_icon_theme;
|
||||
};
|
||||
|
||||
|
||||
# Freedesktop library
|
||||
startup_notification = import ./platform/startup-notification {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig xlibs;
|
||||
};
|
||||
|
||||
# Required for nautilus
|
||||
libunique = import ./platform/libunique {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig gettext;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
};
|
||||
|
||||
gtkglext = import ./platform/gtkglext {
|
||||
inherit (pkgs) stdenv fetchurl mesa pkgconfig;
|
||||
inherit (pkgs.gtkLibs) gtk pango;
|
||||
};
|
||||
|
||||
#### DESKTOP
|
||||
|
||||
gnome_keyring = import ./desktop/gnome-keyring {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python;
|
||||
inherit (pkgs.gtkLibs) glib gtk;
|
||||
inherit intltool GConf;
|
||||
};
|
||||
|
||||
libsoup = import ./desktop/libsoup {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit GConf gnome_keyring;
|
||||
};
|
||||
|
||||
libwnck = import ./desktop/libwnck {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig;
|
||||
inherit (pkgs.xlibs) libX11;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit intltool;
|
||||
};
|
||||
|
||||
# Not part of GNOME desktop, but provides CSS support for librsvg
|
||||
libcroco = import ./desktop/libcroco {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
};
|
||||
|
||||
librsvg = import ./desktop/librsvg {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2;
|
||||
inherit (pkgs.gtkLibs) glib gtk;
|
||||
inherit libcroco;
|
||||
};
|
||||
|
||||
libgweather = import ./desktop/libgweather {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1 nettle gmp;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit intltool GConf libsoup;
|
||||
};
|
||||
|
||||
gvfs = import ./desktop/gvfs {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool GConf gnome_keyring libsoup;
|
||||
};
|
||||
|
||||
libgnomekbd = import ./desktop/libgnomekbd {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
|
||||
inherit (pkgs.gtkLibs) glib gtk;
|
||||
inherit intltool GConf libglade;
|
||||
};
|
||||
|
||||
# Removed from recent GNOME releases, but still required
|
||||
scrollkeeper = import ./desktop/scrollkeeper {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake;
|
||||
};
|
||||
|
||||
# scrollkeeper replacement
|
||||
rarian = import ./desktop/rarian {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
|
||||
};
|
||||
|
||||
gnome_doc_utils = import ./desktop/gnome-doc-utils {
|
||||
inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
|
||||
makeWrapper;
|
||||
inherit intltool scrollkeeper;
|
||||
libxml2 = pkgs.libxml2Python;
|
||||
};
|
||||
|
||||
zenity = import ./desktop/zenity {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
|
||||
inherit (pkgs.gtkLibs) glib gtk pango atk;
|
||||
inherit gnome_doc_utils intltool libglade;
|
||||
inherit (pkgs.xlibs) libX11;
|
||||
};
|
||||
|
||||
metacity = import ./desktop/metacity {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libcanberra;
|
||||
inherit (pkgs.gtkLibs) glib gtk;
|
||||
inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage;
|
||||
inherit intltool GConf startup_notification zenity gnome_doc_utils;
|
||||
};
|
||||
|
||||
gnome_menus = import ./desktop/gnome-menus {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig python;
|
||||
inherit (pkgs.gtkLibs) glib;
|
||||
inherit intltool;
|
||||
};
|
||||
|
||||
gnome_desktop = import ./desktop/gnome-desktop {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which;
|
||||
libxml2 = pkgs.libxml2Python;
|
||||
inherit (pkgs.xlibs) libX11;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit intltool GConf gnome_doc_utils;
|
||||
};
|
||||
|
||||
gnome_panel = import ./desktop/gnome-panel {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1;
|
||||
libxml2 = pkgs.libxml2Python;
|
||||
inherit (pkgs.gtkLibs) glib gtk pango atk;
|
||||
inherit (pkgs.xlibs) libXau;
|
||||
inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop;
|
||||
inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl;
|
||||
};
|
||||
|
||||
gnome_session = import ./desktop/gnome-session {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus;
|
||||
inherit (pkgs.gtkLibs) gtk pango atk;
|
||||
inherit (pkgs.xlibs) libXau libXtst inputproto;
|
||||
inherit intltool libglade startup_notification GConf;
|
||||
};
|
||||
|
||||
gnome_settings_daemon = import ./desktop/gnome-settings-daemon {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit intltool GConf gnome_desktop libglade libgnomekbd;
|
||||
};
|
||||
|
||||
gnome_control_center = import ./desktop/gnome-control-center {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2;
|
||||
inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils;
|
||||
inherit (pkgs.gtkLibs) glib gtk pango atk;
|
||||
inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd libunique;
|
||||
inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon;
|
||||
inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2;
|
||||
libxml2 = pkgs.libxml2Python;
|
||||
};
|
||||
|
||||
gtksourceview = import ./desktop/gtksourceview {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig cairo perl intltool
|
||||
gettext;
|
||||
inherit (pkgs.gtkLibs) atk glib gtk pango;
|
||||
libxml2 = pkgs.libxml2Python;
|
||||
};
|
||||
|
||||
nautilus = import ./desktop/nautilus {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info;
|
||||
inherit (pkgs.gtkLibs) gtk;
|
||||
inherit gnome_desktop libunique intltool GConf;
|
||||
};
|
||||
|
||||
gnome_icon_theme = import ./desktop/gnome-icon-theme {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils;
|
||||
};
|
||||
|
||||
vte = import ./desktop/vte {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig ncurses python;
|
||||
inherit intltool glib gtk;
|
||||
};
|
||||
|
||||
#### BINDINGS
|
||||
|
||||
libglademm = import ./bindings/libglademm {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig intltool;
|
||||
inherit gtkmm libglade;
|
||||
};
|
||||
|
||||
}) {}
|
133
pkgs/desktops/gnome-2/default.nix
Normal file
133
pkgs/desktops/gnome-2/default.nix
Normal file
|
@ -0,0 +1,133 @@
|
|||
{ callPackage, self, stdenv, gettext, overrides ? {} }:
|
||||
{
|
||||
__overrides = overrides;
|
||||
|
||||
# Backward compatibility.
|
||||
gtkdoc = self.gtk_doc;
|
||||
startupnotification = self.startup_notification;
|
||||
gnomedocutils = self.gnome_doc_utils;
|
||||
gnomeicontheme = self.gnome_icon_theme;
|
||||
gnomepanel = self.gnome_panel;
|
||||
|
||||
#### PLATFORM
|
||||
|
||||
audiofile = callPackage ./platform/audiofile { };
|
||||
|
||||
esound = callPackage ./platform/esound { };
|
||||
|
||||
libIDL = callPackage ./platform/libIDL {
|
||||
gettext = if stdenv.isDarwin then gettext else null;
|
||||
};
|
||||
|
||||
ORBit2 = callPackage ./platform/ORBit2 { };
|
||||
|
||||
libart_lgpl = callPackage ./platform/libart_lgpl { };
|
||||
|
||||
libglade = callPackage ./platform/libglade { };
|
||||
|
||||
libgnomeprint = callPackage ./platform/libgnomeprint { };
|
||||
|
||||
libgnomeprintui = callPackage ./platform/libgnomeprintui { };
|
||||
|
||||
libgnomecups = callPackage ./platform/libgnomecups { };
|
||||
|
||||
libgtkhtml = callPackage ./platform/libgtkhtml { };
|
||||
|
||||
intltool = callPackage ./platform/intltool { };
|
||||
|
||||
GConf = callPackage ./platform/GConf { };
|
||||
|
||||
libgnomecanvas = callPackage ./platform/libgnomecanvas { };
|
||||
|
||||
libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
|
||||
|
||||
# for git-head builds
|
||||
gnome_common = callPackage platform/gnome-common { };
|
||||
|
||||
gnome_mime_data = callPackage ./platform/gnome-mime-data { };
|
||||
|
||||
gnome_vfs = callPackage ./platform/gnome-vfs { };
|
||||
|
||||
gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
|
||||
|
||||
libgnome = callPackage ./platform/libgnome { };
|
||||
|
||||
libgnomeui = callPackage ./platform/libgnomeui { };
|
||||
|
||||
libbonobo = callPackage ./platform/libbonobo { };
|
||||
|
||||
libbonoboui = callPackage ./platform/libbonoboui { };
|
||||
|
||||
at_spi = callPackage ./platform/at-spi { };
|
||||
|
||||
glib_networking = callPackage ./platform/glib-networking { };
|
||||
|
||||
gtk_doc = callPackage ./platform/gtk-doc { };
|
||||
|
||||
gtkhtml = callPackage ./platform/gtkhtml { };
|
||||
|
||||
|
||||
# Freedesktop library
|
||||
startup_notification = callPackage ./platform/startup-notification { };
|
||||
|
||||
# Required for nautilus
|
||||
libunique = callPackage ./platform/libunique { };
|
||||
|
||||
gtkglext = callPackage ./platform/gtkglext { };
|
||||
|
||||
#### DESKTOP
|
||||
|
||||
gnome_keyring = callPackage ./desktop/gnome-keyring { };
|
||||
|
||||
libsoup = callPackage ./desktop/libsoup { };
|
||||
|
||||
libwnck = callPackage ./desktop/libwnck { };
|
||||
|
||||
# Not part of GNOME desktop, but provides CSS support for librsvg
|
||||
libcroco = callPackage ./desktop/libcroco { };
|
||||
|
||||
librsvg = callPackage ./desktop/librsvg { };
|
||||
|
||||
libgweather = callPackage ./desktop/libgweather { };
|
||||
|
||||
gvfs = callPackage ./desktop/gvfs { };
|
||||
|
||||
libgnomekbd = callPackage ./desktop/libgnomekbd { };
|
||||
|
||||
# Removed from recent GNOME releases, but still required
|
||||
scrollkeeper = callPackage ./desktop/scrollkeeper { };
|
||||
|
||||
# scrollkeeper replacement
|
||||
rarian = callPackage ./desktop/rarian { };
|
||||
|
||||
gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
|
||||
|
||||
zenity = callPackage ./desktop/zenity { };
|
||||
|
||||
metacity = callPackage ./desktop/metacity { };
|
||||
|
||||
gnome_menus = callPackage ./desktop/gnome-menus { };
|
||||
|
||||
gnome_desktop = callPackage ./desktop/gnome-desktop { };
|
||||
|
||||
gnome_panel = callPackage ./desktop/gnome-panel { };
|
||||
|
||||
gnome_session = callPackage ./desktop/gnome-session { };
|
||||
|
||||
gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { };
|
||||
|
||||
gnome_control_center = callPackage ./desktop/gnome-control-center { };
|
||||
|
||||
gtksourceview = callPackage ./desktop/gtksourceview { };
|
||||
|
||||
nautilus = callPackage ./desktop/nautilus { };
|
||||
|
||||
gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
|
||||
|
||||
vte = callPackage ./desktop/vte { };
|
||||
|
||||
#### BINDINGS
|
||||
|
||||
libglademm = callPackage ./bindings/libglademm { };
|
||||
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python
|
||||
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, hal, cairo, popt, which, python
|
||||
, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2
|
||||
, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
|
||||
, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
|||
url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
|
||||
sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
|
||||
};
|
||||
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
|
||||
buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
|
||||
gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2
|
||||
libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ];
|
||||
configureFlags = "--disable-scrollkeeper";
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk
|
||||
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk
|
||||
, intltool, GConf, gnome_doc_utils}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -8,6 +8,6 @@ stdenv.mkDerivation {
|
|||
sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp";
|
||||
};
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk
|
||||
buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
|
||||
intltool GConf gnome_doc_utils ];
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper,
|
||||
{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool, scrollkeeper,
|
||||
makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380";
|
||||
};
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper
|
||||
buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper
|
||||
makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python
|
||||
{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
|
||||
, glib, gtk, pango, atk, libXau
|
||||
, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
|
||||
, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
|||
url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2;
|
||||
sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1";
|
||||
};
|
||||
buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau
|
||||
buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau
|
||||
intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop
|
||||
libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
|
||||
configureFlags = "--disable-scrollkeeper";
|
|
@ -1,5 +1,5 @@
|
|||
{stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango,
|
||||
libxml2, perl, intltool, gettext}:
|
||||
libxml2Python, perl, intltool, gettext}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtksourceview-2.9.9";
|
||||
|
@ -7,6 +7,6 @@ stdenv.mkDerivation {
|
|||
url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
|
||||
sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
|
||||
};
|
||||
buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
|
||||
buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
|
||||
gettext];
|
||||
}
|
|
@ -4544,7 +4544,7 @@ let
|
|||
|
||||
webkit =
|
||||
builderDefsPackage ../development/libraries/webkit {
|
||||
inherit (gnome28) gtkdoc libsoup;
|
||||
inherit (gnome) gtkdoc libsoup;
|
||||
inherit (gtkLibs) gtk atk pango glib;
|
||||
inherit freetype fontconfig gettext gperf curl
|
||||
libjpeg libtiff libpng libxml2 libxslt sqlite
|
||||
|
@ -4558,7 +4558,7 @@ let
|
|||
|
||||
webkitSVN =
|
||||
builderDefsPackage ../development/libraries/webkit/svn.nix {
|
||||
inherit (gnome28) gtkdoc libsoup;
|
||||
inherit (gnome) gtkdoc libsoup;
|
||||
inherit (gtkLibs) gtk atk pango glib;
|
||||
inherit freetype fontconfig gettext gperf curl
|
||||
libjpeg libtiff libpng libxml2 libxslt sqlite
|
||||
|
@ -6952,7 +6952,7 @@ let
|
|||
which gettext makeWrapper file libidn sqlite docutils libnotify
|
||||
vala dbus_glib;
|
||||
inherit (gtkLibs) gtk glib;
|
||||
inherit (gnome28) gtksourceview;
|
||||
inherit (gnome) gtksourceview;
|
||||
inherit (webkit.passthru.args) libsoup;
|
||||
inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
|
||||
};
|
||||
|
@ -7280,7 +7280,7 @@ let
|
|||
|
||||
surf = callPackage ../applications/misc/surf {
|
||||
inherit (gtkLibs) gtk glib;
|
||||
libsoup = gnome28.libsoup;
|
||||
libsoup = gnome.libsoup;
|
||||
};
|
||||
|
||||
svk = perlPackages.SVK;
|
||||
|
@ -7359,7 +7359,7 @@ let
|
|||
inherit pkgconfig webkit makeWrapper;
|
||||
inherit (gtkLibs) gtk glib;
|
||||
inherit (xlibs) libX11 kbproto;
|
||||
inherit (gnome28) glib_networking libsoup;
|
||||
inherit (gnome) glib_networking libsoup;
|
||||
};
|
||||
|
||||
valknut = callPackage ../applications/networking/p2p/valknut {
|
||||
|
@ -7856,9 +7856,12 @@ let
|
|||
# import ../desktops/e17 { inherit callPackage pkgs; }
|
||||
# );
|
||||
|
||||
gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs);
|
||||
gnome2 = (callPackage ../desktops/gnome-2 {
|
||||
callPackage = pkgs.newScope pkgs.gnome2;
|
||||
self = pkgs.gnome2;
|
||||
} // pkgs.gtkLibs);
|
||||
|
||||
gnome = gnome28;
|
||||
gnome = recurseIntoAttrs gnome2;
|
||||
|
||||
kde3 = recurseIntoAttrs {
|
||||
|
||||
|
|
Loading…
Reference in a new issue