diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-01-08 22:48:13 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-01-08 22:48:13 +0100 |
commit | 5c780036c595d3817207a08934b3cdb67aa2bd1a (patch) | |
tree | cae450e80a2a10c499dbf3f786c4fb23bb27356f /pkgs/data | |
parent | a823616723c44700a1c976fee77aafb470388e19 (diff) | |
parent | 3f0fee752d6f5f5d0774cc7d9bcf8491562b453b (diff) | |
download | nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.gz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.bz2 nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.lz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.xz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.zst nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.zip |
Merge branch 'master' into staging-next
The nss rebuild isn't so small.
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/themes/greybird/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 1c5a631a48c..cc665749d3c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.10"; + version = "3.22.11"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9"; + sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc"; }; nativeBuildInputs = [ - autoreconfHook - which + meson + ninja + pkgconfig sassc - glib - libxml2 ]; buildInputs = [ @@ -30,8 +29,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; - homepage = https://github.com/shimmerproject/Greybird; - license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 + homepage = "https://github.com/shimmerproject/Greybird"; + license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; |