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

merge

Browse Source
This commit is contained in:
Domen Kožar 2014-01-26 09:58:47 +01:00
commit a7d0a53d9e
17 changed files with 94 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig
, intltool, libxslt }:
, intltool, libxslt, gobjectIntrospection, dbus_libs }:
stdenv.mkDerivation rec {
project = "telepathy-logger";
@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
};
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];
NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
gobjectIntrospection dbus_libs ];
nativeBuildInputs = [ libxslt ];

3
pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
, libX11, xextproto, libSM, libICE, libXtst, libXi }:
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation (rec {
versionMajor = "2.10";
@ -15,6 +15,7 @@ stdenv.mkDerivation (rec {
buildInputs = [
python pkgconfig popt intltool dbus_glib
libX11 xextproto libSM libICE libXtst libXi
gobjectIntrospection
];
# ToDo: on non-NixOS we create a symlink from there?

4
pkgs/desktops/gnome-3/core/gconf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2
{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
, intltool, polkit, orbit }:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
};
buildInputs = [ libxml2 polkit gtk orbit ];
buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
propagatedBuildInputs = [ glib dbus_glib ];
nativeBuildInputs = [ pkgconfig intltool ];

7
pkgs/desktops/gnome-3/core/gcr/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }:
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "gcr-3.10.1";
@ -10,12 +11,10 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig intltool gnupg p11_kit glib
pkgconfig intltool gnupg p11_kit glib gobjectIntrospection
libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk
];
configureFlags = [ "--disable-introspection" ];
#doCheck = true;
meta = with stdenv.lib; {

8
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11
, gtk, libcanberra_gtk3, pam, libtool
}:
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "gdm-3.10.0.1";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz";
sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";
};
buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice libX11 gtk libcanberra_gtk3 pam libtool ];
buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice
gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];
meta = with stdenv.lib; {
platforms = platforms.linux;

4
pkgs/desktops/gnome-3/core/gjs/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }:
{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with gnome3;
[ gobjectIntrospection pkgconfig glib ];
[ gobjectIntrospection pkgconfig glib pango ];
propagatedBuildInputs = [ spidermonkey_17 ];

6
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit
, docbook_xsl_ns, docbook_xsl }:
, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit
, docbook_xsl_ns, docbook_xsl, gnome3 }:
stdenv.mkDerivation rec {
name = "gnome-keyring-3.10.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q";
};
buildInputs = [
buildInputs = with gnome3; [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
pango gcr gdk_pixbuf atk p11_kit
];

13
pkgs/desktops/gnome-3/core/gnome-menus/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
let
version = "3.10.1";
in
stdenv.mkDerivation {
name = "gnome-menus-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
stdenv.mkDerivation rec {
name = "gnome-menus-${version}";
version = "3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
};

2
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "gnome-online-accounts-3.10.2";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz";
sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b";
};

8
pkgs/desktops/gnome-3/core/gnome-session/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
, libxslt, intltool, makeWrapper }:
, libxslt, intltool, makeWrapper, systemd }:
stdenv.mkDerivation rec {
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n";
};
configureFlags = "--enable-systemd";
buildInputs = with gnome3;
[ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
gsettings_desktop_schemas upower intltool gconf makeWrapper ];
# TODO: dbus, gnome-shell, gnome-settings-daemon
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
postInstall = ''
wrapProgram "$out/bin/gnome-session" \

7
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
, docbook_xsl, docbook_xsl_ns, makeWrapper }:
, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }:
stdenv.mkDerivation rec {
name = "gnome-settings-daemon-3.10.2";
@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
};
configureFlags = "--disable-ibus";
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
buildInputs = with gnome3;
[ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop
lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper ];
@ -25,6 +23,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix PATH : "${glib}/bin" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';

43
pkgs/desktops/gnome-3/core/gnome-shell/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
stdenv.mkDerivation rec {
name = "gnome-shell-3.10.2.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz";
sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j";
};
buildInputs = with gnome3;
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice
libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger ];
configureFlags = "--disable-static";
preBuild = ''
patchShebangs src/data-to-c.pl
'';
postInstall = with gnome3; ''
wrapProgram "$out/bin/gnome-shell" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
--prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

3
pkgs/desktops/gnome-3/default.nix
View File

@ -3,6 +3,7 @@
rec {
inherit (pkgs) glib gtk2 gtk3 gnome2;
gtk = gtk3; # just to be sure
libcanberra = pkgs.libcanberra_gtk3; # just to be sure
inherit (pkgs.gnome2) gnome_common ORBit2;
orbit = ORBit2;
@ -47,6 +48,8 @@ rec {
gnome_session = callPackage ./core/gnome-session { };
gnome_shell = callPackage ./core/gnome-shell { };
gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
gnome_terminal = callPackage ./core/gnome-terminal { };

8
pkgs/development/libraries/ibus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig
{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
stdenv.mkDerivation rec {
@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
};
configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library";
buildInputs = [
makeWrapper python glib wayland
makeWrapper python gnome3.glib wayland
intltool pkgconfig gnome3.gtk2
gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
libnotify isocodes gobjectIntrospection
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
preBuild = "patchShebangs ./scripts";
postInstall = ''
#${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
for f in "$out"/bin/*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
done

7
pkgs/development/libraries/polkit/default.nix
View File

@ -53,13 +53,10 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
"--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
"--enable-introspection"
];
makeFlags =
''
INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
'';
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
#doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs

4
pkgs/os-specific/linux/upower/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
, useSystemd ? true, systemd
, useSystemd ? true, systemd, gobjectIntrospection
}:
assert stdenv.isLinux;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]
[ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
++ stdenv.lib.optional useSystemd systemd;
nativeBuildInputs = [ pkgconfig ];

14
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
, networkmanager_openconnect, udev, hicolor_icon_theme }:
@ -19,15 +19,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gtk libglade networkmanager libnotify libsecret dbus_glib
polkit isocodes makeWrapper udev GConf libgnome_keyring
gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib
polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
];
nativeBuildInputs = [ intltool pkgconfig ];
propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ];
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
makeFlags = [
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
@ -50,7 +48,7 @@ stdenv.mkDerivation rec {
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${GConf}/bin"
--prefix PATH ":" "${gnome3.gconf}/bin"
'';
meta = with stdenv.lib; {