Merge pull request #92920 from primeos/scons

scons: 3.1.2 -> 4.0.0
2020-07-18 13:36:29 +02:00
parent e33bed77ce 595a36d846
commit 5b14758d31
17 changed files with 43 additions and 33 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, libX11, pkgconfig
+{ stdenv, fetchurl, sconsPackages, libX11, pkgconfig
 , libusb1, boost, glib, dbus-glib }:

 let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
  };

  makeFlags = [ "PREFIX=$(out)" ];
-  nativeBuildInputs = [ pkgconfig scons.py2 ];
+  nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
  buildInputs = [ libX11 libusb1 boost glib dbus-glib ];
  dontUseSconsInstall = true;