Merge pull request #50293 from matthewbauer/cleanups2

Add setup-hooks for scons and waf
This commit is contained in:
Matthew Bauer
2018-11-13 19:17:00 -06:00
committed by GitHub
73 changed files with 429 additions and 728 deletions

View File

@@ -22,9 +22,8 @@ in buildPythonPackage rec {
sha256 = "01vm8mqhpdrwlxw6rxbg3wz51njq69yn862141mja00mllg3j7pg";
};
buildInputs = stdenv.lib.optionals doCheck [ vmprof pyqt4 ];
propagatedBuildInputs = [ scons ];
checkInputs = [ vmprof pyqt4 ];
nativeBuildInputs = [ scons ];
postPatch = ''
patchShebangs tests/run-tests

View File

@@ -10,13 +10,12 @@ buildPythonPackage rec {
sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a";
};
buildPhase = ''
preBuild = ''
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" src/SConscript
scons
'';
installPhase = ''
preInstall = ''
sed -i -e "s@ python_lib_path = get_python_lib(plat_specific=True)@ python_lib_path = \'/lib/python2.7/site-packages\'@" src/SConscript
scons install DESTDIR=$out
'';
buildInputs = [ python exiv2 scons boost ];