From 5572288ec2d7f23013053e55d6154933dd5029d0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH] openvdb: *Flags are lists --- .../development/libraries/openvdb/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 483b3d788e29..840da0461706 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -20,21 +20,22 @@ stdenv.mkDerivation rec sourceRoot=$(echo */openvdb) ''; - installTargets = "install_lib"; + installTargets = [ "install_lib" ]; enableParallelBuilding = true; - buildFlags = ''lib - DESTDIR=$(out) - HALF_LIB=-lHalf - TBB_LIB=-ltbb - BLOSC_LIB=-lblosc - LOG4CPLUS_LIB= - BLOSC_INCLUDE_DIR=${c-blosc}/include/ - BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + buildFlags = [ + "lib" + "DESTDIR=$(out)" + "HALF_LIB=-lHalf" + "TBB_LIB=-ltbb" + "BLOSC_LIB=-lblosc" + "LOG4CPLUS_LIB=" + "BLOSC_INCLUDE_DIR=${c-blosc}/include/" + "BLOSC_LIB_DIR=${c-blosc}/lib/" + ]; - installFlags = ''DESTDIR=$(out)''; + installFlags = [ "DESTDIR=$(out)" ]; NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; NIX_LDFLAGS="-lboost_iostreams";