diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-28 22:30:55 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-28 22:30:55 +0200 |
| commit | 69091bae844fe881da1b29f1bd0458f1a46f2bfc (patch) | |
| tree | f90882fa1127cb3fbd7939d409c9b64a982cffbf /pkgs/data | |
| parent | b5f95a5303a4bf20b513c2a4f636b82cb588239a (diff) | |
| parent | ad6496f768545dcf64296a31af7b3e0666858bb6 (diff) | |
| download | nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar.gz nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar.bz2 nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar.lz nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar.xz nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.tar.zst nixpkgs-69091bae844fe881da1b29f1bd0458f1a46f2bfc.zip | |
Merge pull request #15741 from romildo/fix.themes
Numix and Paper themes: fix installation dir and update revision
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/icons/numix-icon-theme-circle/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/icons/paper-icon-theme/default.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 61da6a23769..ace58a4d703 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -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; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 731d6158304..93c39b9eddd 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -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; { |