ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

ceres-solver: glog builds on darwin just fine now

Browse Source
This commit is contained in:
Vlad Ki 2016-11-19 14:48:05 +02:00
parent df21b76a21
commit 01643264c2
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/ceres-solver/default.nix
View File

@ -3,7 +3,7 @@
, fetchurl
, cmake
, google-gflags ? null
, glog ? null
, glog
, runTests ? false
}:
@ -12,11 +12,6 @@ assert runTests -> google-gflags != null;
let
version = "1.10.0";
# glog currently doesn't build on darwin
# Issue: https://code.google.com/p/google-glog/issues/detail?id=121
useGlog = glog != null && !stdenv.isDarwin;
in
stdenv.mkDerivation {
name = "ceres-solver-${version}";
@ -26,8 +21,7 @@ stdenv.mkDerivation {
sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17";
};
buildInputs = [ cmake ]
++ stdenv.lib.optional useGlog glog
buildInputs = [ cmake glog ]
++ stdenv.lib.optional (google-gflags != null) google-gflags;
inherit eigen;
@ -38,7 +32,6 @@ stdenv.mkDerivation {
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
${if !useGlog then "-DMINIGLOG=ON" else ""}
";
meta = with stdenv.lib; {