From 6ed72b2c1ac898f8bab10761ae14945813db28a2 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 06:34:34 -0300 Subject: [PATCH] vertex-theme: 20160329 -> 20161009 --- pkgs/misc/themes/vertex/default.nix | 31 +++++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 7c6778a40d54..bbacfa2f5e5a 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,33 +1,38 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-vertex-${version}"; - version = "20160329"; + name = "${pname}-${version}"; + pname = "vertex-theme"; + version = "20161009"; src = fetchFromGitHub { owner = "horst3180"; - repo = "Vertex-theme"; - rev = version; - sha256 = "1zafnbxn9hgi4lmi254iw9jyhifcqijxa7cymwjpyy0jfa6sm1qj"; + repo = pname; + rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; + sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; }; - buildInputs = [ autoreconfHook gtk3 pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - configureFlags = "--disable-unity"; + buildInputs = [ gtk-engine-murrine ]; + + configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ]; postInstall = '' - mkdir -p $out/share/doc/theme-vertex - cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/ + mkdir -p $out/share/plank/themes + cp -r extra/*-Plank $out/share/plank/themes - mkdir -p $out/share/doc/theme-vertex/extra - cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra + mkdir -p $out/share/doc/$pname/Chrome + cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome + cp -r extra/Firefox $out/share/doc/$pname + cp AUTHORS README.md $out/share/doc/$pname/ ''; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; license = licenses.gpl3; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; + maintainers = with maintainers; [ rycee romildo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4370e9eedc..ac73c1779488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16174,7 +16174,7 @@ in in recurseIntoAttrs (lib.makeScope qt5.newScope merged); - theme-vertex = callPackage ../misc/themes/vertex { }; + vertex-theme = callPackage ../misc/themes/vertex { }; xfce = xfce4-12; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });