diff options
| author | Vlad Ki <vlad@kirillov.im> | 2016-11-19 14:48:05 +0200 |
|---|---|---|
| committer | Vlad Ki <vlad@kirillov.im> | 2016-11-19 14:49:15 +0200 |
| commit | 01643264c22f718e53adf94cbc84ba8424bd89f3 (patch) | |
| tree | 4a1a1716e426b6292d08da32f137e678dda9227a /pkgs/development/libraries/ceres-solver | |
| parent | df21b76a21b3af51743501407e9b40df795996e9 (diff) | |
| download | nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar.gz nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar.bz2 nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar.lz nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar.xz nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.tar.zst nixlib-01643264c22f718e53adf94cbc84ba8424bd89f3.zip | |
ceres-solver: glog builds on darwin just fine now
Diffstat (limited to 'pkgs/development/libraries/ceres-solver')
| -rw-r--r-- | pkgs/development/libraries/ceres-solver/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 24d309372047..7cd848e602aa 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -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; { |