Merge master into staging-next

2018-11-30 17:46:21 +01:00
parent 70f5d64cb3 74e283403c
commit 1828a5c5ba
101 changed files with 1225 additions and 601 deletions
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {

  buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];

-  configurePhase = "makeFlags=PREFIX=$out";
+  dontUseImakeConfigure = true;
+
+  makeFlags = "PREFIX=$(out)";

  hardeningDisable = [ "format" ];