diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-14 15:12:08 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:49 +0100 |
commit | 6e2443f2822bc6d363f42b83ea420d69fee59a30 (patch) | |
tree | 65087aedda3d0833a2815225ac10c3f79ff750e1 /pkgs/desktops | |
parent | 3d2db221f71194c37e04e88aa07f6da570f12f25 (diff) | |
download | nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar.gz nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar.bz2 nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar.lz nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar.xz nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.tar.zst nixpkgs-6e2443f2822bc6d363f42b83ea420d69fee59a30.zip |
gnome-themes-extra: rename from gnome-themes-standard
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix | 28 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix | 25 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 5 |
3 files changed, 31 insertions, 27 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix new file mode 100644 index 00000000000..2388825d6cf --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf }: + +let + pname = "gnome-themes-extra"; + version = "3.27.90"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix deleted file mode 100644 index c56a768db68..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-${version}"; - version = "3.27.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9d4b9726bd2..c2495d40df1 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -29,7 +29,7 @@ let gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-standard defaultIconTheme gnome-shell-extensions + gnome-themes-extra defaultIconTheme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -160,7 +160,7 @@ let gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome-themes-standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -424,6 +424,7 @@ let gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 gnome_shell = gnome-shell; # added 2018-02-25 gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 |