JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15741 from romildo/fix.themes

Browse Source 
Numix and Paper themes: fix installation dir and update revision
This commit is contained in:
Joachim Fasting 2016-05-28 22:30:55 +02:00
commit 69091bae84
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2016-05-18";
version = "2016-05-25";
package-name = "numix-icon-theme-circle";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "11a343dcd9b95e2574706157ff7bfe9aa30441d2";
sha256 = "0d00fj0hmqchm12j89s1r11ayg7gh8p6cn4fd7zva5n52z35az1w";
rev = "e2d2fe68e34e1650584f798c3cdb7e91ef62e6d3";
sha256 = "0fah812ymc6kczjhjsz0ai57ih6d8r6pknhvc54i7r3xqxshryc8";
};
dontBuild = true;

10
pkgs/data/icons/paper-icon-theme/default.nix
View File

@ -3,19 +3,19 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "paper-icon-theme";
version = "2016-05-21";
version = "2016-05-25";
src = fetchFromGitHub {
owner = "snwh";
repo = package-name;
rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7";
sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq";
rev = "f221537532181a71938faaa1f695c762defe2626";
sha256 = "0knsdhgssh1wyhcrbk6lddqy7zn24528lnajqij467mpgiliabfy";
};
nativeBuildInputs = [ autoreconfHook ];
installPhase = ''
make install DESTDIR="$out"
postPatch = ''
substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
'';
meta = with stdenv.lib; {

10
pkgs/misc/themes/numix-gtk-theme/default.nix
View File

@ -3,22 +3,22 @@
}:
stdenv.mkDerivation rec {
version = "2016-05-19";
version = "2016-05-25";
name = "numix-gtk-theme-${version}";
src = fetchFromGitHub {
repo = "numix-gtk-theme";
owner = "numixproject";
rev = "266945047ad8c148d36d0d1f00b39730b84482a9";
sha256 = "108qjqwn9shqjkbadyw79y1wbq5ndv30x7xw5wjmbcss5jikr3v1";
rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa";
sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g";
};
nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
buildInputs = [ gtk-engine-murrine ];
installPhase = ''
make install DESTDIR="$out"
postPatch = ''
substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
'';
meta = {

10
pkgs/misc/themes/paper-gtk-theme/default.nix
View File

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
stdenv.mkDerivation rec {
version = "2016-05-18";
version = "2016-05-25";
name = "paper-gtk-theme-${version}";
src = fetchFromGitHub {
owner = "snwh";
repo = "paper-gtk-theme";
rev = "5113d58dc64de70fcc75ad2d6d05c8c8dae2de7f";
sha256 = "1j9l50iyvadpqsq5v14zgml24jgraajr5kl9ji0ar62nlak2bi8s";
rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e";
sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ gtk_engines ];
installPhase = ''
make install DESTDIR="$out"
postPatch = ''
substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
'';
preferLocalBuild = true;