diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2021-05-07 12:01:02 -0700 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-15 20:25:09 +0200 |
| commit | 28f2476fe41fcab6cae85d73a05d6032edd756b0 (patch) | |
| tree | 5d729f382e96972c8d15e3588b30cc03abc50b55 | |
| parent | f070de253cf7bf071f313a8a1a0222d2adaee59f (diff) | |
| download | nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar.gz nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar.bz2 nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar.lz nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar.xz nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.tar.zst nixpkgs-28f2476fe41fcab6cae85d73a05d6032edd756b0.zip | |
arc-theme: 20210127 -> 20210412, switch to meson
| -rw-r--r-- | pkgs/data/themes/arc/default.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index fff5e4bf41a..630d928e602 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -1,9 +1,11 @@ { lib, stdenv , fetchFromGitHub , sassc -, autoreconfHook +, meson +, ninja , pkg-config , gtk3 +, glib , gnome , gtk-engine-murrine , optipng @@ -13,22 +15,24 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20210127"; + version = "20210412"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; + sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8="; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config sassc optipng inkscape gtk3 + glib # for glib-compile-resources ]; propagatedUserEnvPkgs = [ @@ -36,23 +40,21 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - enableParallelBuilding = true; - preBuild = '' # Shut up inkscape's warnings about creating profile directory export HOME="$NIX_BUILD_ROOT" ''; - configureFlags = [ - "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome.gnome-shell.version}" - "--disable-unity" + mesonFlags = [ + "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" + "-Dvariants=light,darker,dark,lighter" + "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" + "-Dgnome_shell_version=${gnome.gnome-shell.version}" + "-Dgtk3_version=${gtk3.version}" + # You will need to patch gdm to make use of this. + "-Dgnome_shell_gresource=true" ]; - postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md - ''; - meta = with lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; |