mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset

Browse source
This commit is contained in:
Luca Bruno 2014-07-08 18:00:00 +02:00
parent 8aacdfee7c
commit da9b510996
10 changed files with 9 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View file

@ -4,9 +4,6 @@
with lib;
let
gnome3 = config.environment.gnome3.packageSet;
in
{
###### interface
@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.at-spi2-core.enable {
environment.systemPackages = [ gnome3.at_spi2_core ];
environment.systemPackages = [ pkgs.at_spi2_core ];
services.dbus.packages = [ gnome3.at_spi2_core ];
services.dbus.packages = [ pkgs.at_spi2_core ];
};

21
pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix
View file

@ -1,21 +0,0 @@
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
versionMajor = "2.12";
versionMinor = "0";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

2
pkgs/desktops/gnome-3/3.10/core/caribou/default.nix
View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt }:
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
stdenv.mkDerivation rec {

2
pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix
View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

4
pkgs/desktops/gnome-3/3.10/default.nix
View file

@ -10,10 +10,6 @@ rec {
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
at_spi2_atk = callPackage ./core/at-spi2-atk { };
at_spi2_core = callPackage ./core/at-spi2-core { };
baobab = callPackage ./core/baobab { };
caribou = callPackage ./core/caribou { };

32
pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix
View file

@ -1,32 +0,0 @@
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation (rec {
versionMajor = "2.12";
versionMinor = "0";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
};
buildInputs = [
python pkgconfig popt intltool dbus_glib
libX11 xextproto libSM libICE libXtst libXi
gobjectIntrospection
];
# ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
NIX_LDFLAGS = "-lintl";
}
)

4
pkgs/desktops/gnome-3/3.12/default.nix
View file

@ -16,10 +16,6 @@ rec {
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
at_spi2_atk = callPackage ./core/at-spi2-atk { };
at_spi2_core = callPackage ./core/at-spi2-core { };
baobab = callPackage ./core/baobab { };
caribou = callPackage ./core/caribou { };

0
pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix → pkgs/development/libraries/at-spi2-atk/default.nix
View file

0
pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix → pkgs/development/libraries/at-spi2-core/default.nix
View file

9
pkgs/top-level/all-packages.nix
View file

@ -4230,6 +4230,10 @@ let
attr = callPackage ../development/libraries/attr { };
at_spi2_core = callPackage ../development/libraries/at-spi2-core { };
at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { };
aqbanking = callPackage ../development/libraries/aqbanking { };
aubio = callPackage ../development/libraries/aubio { };
@ -4811,9 +4815,7 @@ let
cupsSupport = config.gtk2.cups or stdenv.isLinux;
};
gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
inherit (gnome3) at_spi2_atk;
};
gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
gtk = pkgs.gtk2;
@ -9671,7 +9673,6 @@ let
thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
gconf = pkgs.gnome.GConf;
inherit (pkgs.gnome3) at_spi2_atk;
inherit (pkgs.gnome) libgnome libgnomeui;
inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
libXinerama libXrender libXt;