MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change default from gnome 3.10 to gnome 3.12

Browse source
This commit is contained in:
Luca Bruno 2014-09-08 16:02:22 +02:00
parent 152ae27aac
commit e4e39f26ba
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -45,7 +45,7 @@ in {
environment.gnome3.packageSet = mkOption { environment.gnome3.packageSet = mkOption {
default = pkgs.gnome3; default = pkgs.gnome3;
example = literalExample "pkgs.gnome3_12"; example = literalExample "pkgs.gnome3_10";
description = "Which Gnome 3 package set to use."; description = "Which Gnome 3 package set to use.";
}; };

4
nixos/tests/gnome3_12.nix → nixos/tests/gnome3_10.nix
View file

@ -1,5 +1,5 @@
import ./make-test.nix { import ./make-test.nix {
name = "gnome3_12"; name = "gnome3";
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -11,7 +11,7 @@ import ./make-test.nix {
services.xserver.displayManager.auto.enable = true; services.xserver.displayManager.auto.enable = true;
services.xserver.displayManager.auto.user = "alice"; services.xserver.displayManager.auto.user = "alice";
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.enable = true;
environment.gnome3.packageSet = pkgs.gnome3_12; environment.gnome3.packageSet = pkgs.gnome3_10;
}; };
testScript = testScript =

7
pkgs/applications/audio/gtkpod/default.nix
View file

@ -1,11 +1,8 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
libvorbis, hicolor_icon_theme, gdk_pixbuf }: libvorbis, hicolor_icon_theme, gdk_pixbuf }:
let stdenv.mkDerivation rec {
gnome = gnome3_12;
in stdenv.mkDerivation rec {
version = "2.1.4"; version = "2.1.4";
name = "gtkpod-${version}"; name = "gtkpod-${version}";

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

@ -2,6 +2,7 @@
rec { rec {
inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking; inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking;
gnome3 = pkgs.gnome3_10 // { recurseForDerivations = false; };
gtk = gtk3; # just to be sure gtk = gtk3; # just to be sure
libcanberra = pkgs.libcanberra_gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure
inherit (pkgs.gnome2) ORBit2; inherit (pkgs.gnome2) ORBit2;

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

@ -9069,6 +9069,7 @@ let
}; };
gtkpod = callPackage ../applications/audio/gtkpod { gtkpod = callPackage ../applications/audio/gtkpod {
gnome = gnome3;
inherit (gnome) libglade; inherit (gnome) libglade;
}; };
@ -10827,7 +10828,7 @@ let
inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
}; };
gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 { gnome3_10 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
callPackage = pkgs.newScope pkgs.gnome3; callPackage = pkgs.newScope pkgs.gnome3;
self = pkgs.gnome3; self = pkgs.gnome3;
}); });
@ -10836,6 +10837,8 @@ let
callPackage = pkgs.newScope pkgs.gnome3_12; callPackage = pkgs.newScope pkgs.gnome3_12;
}); });
gnome3 = gnome3_12;
gnome = recurseIntoAttrs gnome2; gnome = recurseIntoAttrs gnome2;
hsetroot = callPackage ../tools/X11/hsetroot { }; hsetroot = callPackage ../tools/X11/hsetroot { };