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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-30 08:58:01 +01:00
parent 5bdd7a59c0 d14baf7747
commit 9f84415541
416 changed files with 9638 additions and 5804 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 = ''