From 807b0105b41d101e8fb774d107927ee84571f7c7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 13 Sep 2018 23:44:14 +0200 Subject: [PATCH] ceres-solver: fix darwin build (#46626) The Basel BUILD file conflicts with the cmake build directory on case-insensitive filesystems, eg. darwin. /cc ZHF #45961 --- pkgs/development/libraries/ceres-solver/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 432e49c4354f..043b9e263d8a 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -2,7 +2,7 @@ , eigen , fetchurl , cmake -, google-gflags ? null +, google-gflags , glog , runTests ? false }: @@ -21,7 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen glog ] - ++ stdenv.lib.optional (google-gflags != null) google-gflags; + ++ stdenv.lib.optional runTests google-gflags; + + # The Basel BUILD file conflicts with the cmake build directory on + # case-insensitive filesystems, eg. darwin. + preConfigure = '' + rm BUILD + ''; doCheck = runTests;