public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jonathan Ringer
2019-11-27 22:57:50 -08:00
parent 4cc592761d f4f8169021
commit 0c1c18ca44
207 changed files with 4017 additions and 3629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/facedetect/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ python2Packages.python python2Packages.wrapPython ];
pythonPath = [ python2Packages.numpy python2Packages.opencv ];
pythonPath = [ python2Packages.numpy python2Packages.opencv4 ];
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = ''
substituteInPlace facedetect \
--replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV"
--replace /usr/share/opencv "${python2Packages.opencv4}/share/opencv4"
'';
installPhase = ''