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

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
  buildInputs = [ udev utillinux ];

  postPatch = ''
-    sed -i '1i#include <sys/stat.h>' ldm.c
    substituteInPlace ldm.c \
      --replace "/mnt/" "${mountPath}"
+    sed '16i#include <sys/stat.h>' -i ldm.c
  '';

  buildFlags = "ldm";