diff options
| author | Florian Pester <florian.pester@cyberus-technology.de> | 2020-12-30 12:35:55 +0100 |
|---|---|---|
| committer | Florian <flo@halbmastwurf.de> | 2020-12-31 09:56:07 +0100 |
| commit | b740afa546fd82b6626f87aa5d63c99f84a47d29 (patch) | |
| tree | a6d36a8c6085b26c0b195b4fadc43ac84a4cee69 /pkgs | |
| parent | 75eef96f08c7f5ef5f1cf1c9900359e06c556000 (diff) | |
| download | nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar.gz nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar.bz2 nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar.lz nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar.xz nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.tar.zst nixlib-b740afa546fd82b6626f87aa5d63c99f84a47d29.zip | |
colmap: 3.5 -> 3.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 02592f808d8e..60f9810dfb6a 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.5"; + version = "3.6"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; }; - patches = [ - (fetchpatch { - url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; - sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; - }) - ]; - buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase |