Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2b669057668
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1cd73f25c88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2016

  1. Copy the full SHA
    3170266 View commit details
  2. Merge pull request #20875 from romildo/upd.adapta

    adapta-gtk-theme: 3.21.3.68 -> 3.89.1.66
    joachifm authored Dec 3, 2016
    Copy the full SHA
    e1cd73f View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/misc/themes/adapta/default.nix
14 changes: 8 additions & 6 deletions pkgs/misc/themes/adapta/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, sass, inkscape, glib, which, gtk-engine-murrine }:
{ stdenv, fetchFromGitHub, autoreconfHook, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }:

stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
version = "3.21.3.68";
version = "3.89.1.66";

meta = with stdenv.lib; {
description = "An adaptive GTK+ theme based on Material Design";
@@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
owner = "tista500";
repo = "Adapta";
rev = version;
sha256 = "0wwsmsyxfdgsc7fj1kn4r9zsgs09prizwkjljmirwrfdm6j3387p";
sha256 = "08g941xgxg7i8g1srn3zdxz1nxm24bkrg5cx9ipjqk5cwsck7470";
};

preferLocalBuild = true;
buildInputs = [ gtk-engine-murrine ];
nativeBuildInputs = [ autoreconfHook sass inkscape glib.dev which ];

nativeBuildInputs = [ autoreconfHook parallel sassc inkscape libxml2 glib.dev ];

buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ];

postPatch = "patchShebangs .";

configureFlags = "--enable-chrome --disable-unity";
configureFlags = "--disable-unity";
}