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

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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,8 @@
{ 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 }:
let
gnome = gnome3_12;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
version = "2.1.4";
name = "gtkpod-${version}";

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

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

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

@@ -9069,6 +9069,7 @@ let
};
gtkpod = callPackage ../applications/audio/gtkpod {
gnome = gnome3;
inherit (gnome) libglade;
};
@@ -10827,7 +10828,7 @@ let
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;
self = pkgs.gnome3;
});
@@ -10836,6 +10837,8 @@ let
callPackage = pkgs.newScope pkgs.gnome3_12;
});
gnome3 = gnome3_12;
gnome = recurseIntoAttrs gnome2;
hsetroot = callPackage ../tools/X11/hsetroot { };