diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:57:52 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:58:01 +0100 |
commit | 9f8441554123a3ba06345454c0d6717e303a79ed (patch) | |
tree | a54b76aeeaaafc8ee054a9e300f41f000ddb26fe /pkgs/tools/graphics | |
parent | 5bdd7a59c072f958af57b2daf134b983c3d4b0af (diff) | |
parent | d14baf7747b0d8e17c0a13db673b28f13e06a349 (diff) | |
download | nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.gz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.bz2 nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.lz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.xz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.zst nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/facedetect/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index aab2e111e85..cb697148d04 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -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 = '' |