JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging from Oleksandr:

Browse Source 
Updating some gnome packages and pigz.


svn path=/nixpkgs/trunk/; revision=20154
This commit is contained in:
Lluís Batlle i Rossell 2010-02-21 12:25:36 +00:00
parent bc939a87b4
commit 40985548d1
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome-2.28/default.nix
View File

@ -236,7 +236,7 @@ rec {
};
metacity = import ./desktop/metacity {
inherit (pkgs) stdenv fetchurl pkgconfig;
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;
@ -279,10 +279,10 @@ rec {
};
gnome_control_center = import ./desktop/gnome-control-center {
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal;
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;
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;

4
pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python
, shared_mime_info, desktop_file_utils
, 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
, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}:
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
gtk gnome_doc_utils intltool GConf libglade libgnomekbd
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";
# This makes me cry

4
pkgs/desktops/gnome-2.28/desktop/metacity/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage
, intltool, GConf, startup_notification, zenity, gnome_doc_utils}:
, libcanberra, intltool, GConf, startup_notification, zenity, gnome_doc_utils}:
stdenv.mkDerivation {
name = "metacity-2.28.0";
@ -7,6 +7,6 @@ stdenv.mkDerivation {
url = mirror://gnome/sources/metacity/2.28/metacity-2.28.0.tar.bz2;
sha256 = "0iamb6gw6gl6bfs7nqxpwr9xiij5axxr1iy4bl6g9z11dwx5a886";
};
buildInputs = [ pkgconfig glib gtk libXcomposite libXcursor libXdamage
buildInputs = [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra
intltool GConf startup_notification zenity gnome_doc_utils ];
}

4
pkgs/development/libraries/libxklavier/default.nix
View File

@ -1,11 +1,11 @@
args: with args;
stdenv.mkDerivation rec {
name = "libxklavier-3.9";
name = "libxklavier-4.0";
src = fetchurl {
url = "mirror://sf/gswitchit/${name}.tar.bz2";
sha256 = "462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554";
sha256 = "210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71";
};
# TODO: enable xmodmap support, needs xmodmap DB

4
pkgs/tools/compression/pigz/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, zlib}:
let name = "pigz";
version = "2.1.5";
version = "2.1.6";
in
stdenv.mkDerivation {
name = name + "-" + version;
src = fetchurl {
url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
sha256 = "0fz533wb45r9cx3iaaary2azsvvpd9kmnkx22bskv5jcz3qic7xf";
sha256 = "2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640";
};
buildInputs = [zlib];