Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-12 09:46:53 +00:00
parent bc025e83bd 532b222296
commit b7787d932e
372 changed files with 7520 additions and 3777 deletions
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
  dontBuild = true;

  installPhase = ''
-    mkdir -p $out/share/themes
+    mkdir -p $out/share/themes/Flat-Plat
    rm .gitignore COPYING README.md
-    cp -r . $out/share/themes
+    cp -r . $out/share/themes/Flat-Plat
  '';

  meta = with stdenv.lib; {