Merge branch 'master' into staging

2015-06-25 09:15:05 -05:00
parent 3dd96b1a2c 99d20189b8
commit a8c52d0958
117 changed files with 13095 additions and 14673 deletions
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";

  preInstall = ''
-    mkdir -p $out/{bin,man}
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
  '';

  meta = with stdenv.lib; {