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

2016-07-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
@@ -58,6 +58,9 @@ stdenv.mkDerivation rec {
    CONFIG_FEATURE_MOUNT_CIFS n
    CONFIG_FEATURE_MOUNT_HELPERS y

+    # Set paths for console fonts.
+    CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"
+
    ${extraConfig}
    $extraCrossConfig
    EOF