Skip to content

Commit d97eba7

Browse files
basler: fix the nix shell once again
1 parent ea67c62 commit d97eba7

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

shell.nix

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{ pkgs ? import (fetchTarball {
2-
url = "https://github.com/NixOS/nixpkgs/archive/036660e6294d7ae6e4bfd1b0f4e3f4dc2d53c483.tar.gz";
3-
sha256 = "sha256:06is1fzmw06y63m0i2zyaj554pwh2p8280pg7b8ws1z0sk4r1k5c";
4-
}) {}
5-
}:
1+
let
2+
pkgs = import (fetchTarball {
3+
url = "https://github.com/NixOS/nixpkgs/archive/e3bbbf91cf661f0972fc1c2d3db526513f6e6229.tar.gz";
4+
}) {};
5+
in
66
let
77
ade = pkgs.stdenv.mkDerivation rec {
88
pname = "ade";
@@ -32,15 +32,20 @@ let
3232
hash = "sha256-s+KvBrV/BxrxEvPhHzWCVFQdUQwhUdRJyb0wcGDFpeo=" ;
3333
};
3434

35+
postPatch = (oldAttr.postPatch or "") + ''
36+
substituteInPlace cmake/OpenCVGenPkgconfig.cmake \
37+
--replace "cmake_minimum_required(VERSION 2.8.12.2)" "cmake_minimum_required(VERSION 3.5)"
38+
'';
39+
3540
buildInputs = (oldAttr.buildInputs or []) ++ [ ade ];
3641

3742
nativeBuildInputs =
3843
oldAttr.nativeBuildInputs
3944
++ (with pkgs; [
4045
ant
4146
openjdk
42-
python3
43-
python3Packages.numpy
47+
# python3
48+
# python3Packages.numpy
4449
]);
4550

4651
cmakeFlags =
@@ -51,6 +56,10 @@ let
5156
"-DBUILD_opencv_gapi=ON"
5257
"-DWITH_ADE=ON"
5358
"-Dade_DIR=${ade}/lib/cmake/ade"
59+
"-DBUILD_opencv_python2=OFF"
60+
"-DBUILD_opencv_python3=OFF"
61+
"-DOPENCV_GENERATE_TYPING_STUBS=OFF"
62+
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
5463
];
5564

5665
postInstall = (oldAttr.postInstall or "") + ''

0 commit comments

Comments
 (0)