Merge branch 'master' into staging-next

2019-01-10 13:07:21 +01:00
parent 528664e3bb e0fd84cf43
commit 287144e342
254 changed files with 5494 additions and 3475 deletions
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }:
+{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:

 /*  how to calibrate your monitor:
    Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
 */
 stdenv.mkDerivation {
  name = "lprof-1.11.4.1";
-  nativeBuildInputs = [ scons ];
+  nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
  buildInputs = [ qt3 lcms1 libtiff vigra ];

  hardeningDisable = [ "format" ];