Merge branch 'master.upstream' into staging.upstream

2015-08-19 13:54:48 -07:00
parent e91523aab5 ef07bd04dc
commit 901482ad99
64 changed files with 1164 additions and 1497 deletions
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    ''
      mkdir -p data/keymaps/i386/neo
      cat "$neoSrc" > data/keymaps/i386/neo/neo.map
-      sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in
+      sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am

      # Add the dvp keyboard in the dvorak folder
      ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map