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
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
    qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib
  ];

+  # hack: needed to fix build issues in
+  # http://hydra.nixos.org/build/38322959/nixlog/1
+  # should be an upstream issue but it's easy to fix
+  NIX_LDFLAGS = "-lz";
+
  nativeBuildInputs = [ qmake4Hook ];

  preConfigure = ''