diff options
Diffstat (limited to 'pkgs/desktops')
4 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 6ca2a9142c15..277ca9a1a698 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkgconfig intltool which ]; - configureFlags = "--disable-scrollkeeper"; + + configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2"; } diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix index 948774572670..ab25845c413d 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.8"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "085sqww174vl3i9ccb477v706rkjs2d107rl96ma1kbl2jyar226"; + sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 5d517da82b39..8af6d65420a6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -3,7 +3,8 @@ rec { inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; gtk = gtk3; - orbit = pkgs.gnome2.ORBit2; + inherit (pkgs.gnome2) gnome_common ORBit2; + orbit = ORBit2; inherit (lib) lowPrio hiPrio appendToName makeOverridable; @@ -11,7 +12,7 @@ rec { #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { }); + at_spi2_atk = callPackage ./core/at-spi2-atk { }; at_spi2_core = callPackage ./core/at-spi2-core { }; diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix index 4d22f6ad7466..1f0b6c2a971d 100644 --- a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3 -, intltool, gnome_doc_utils}: +, intltool, gnome_doc_utils }: stdenv.mkDerivation rec { @@ -7,6 +7,8 @@ stdenv.mkDerivation rec { minorVersion = "3"; name = "gnome-desktop-${majorVersion}.${minorVersion}"; + enableParallelBuilding = true; + src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba"; |