diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
| commit | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (patch) | |
| tree | f0fe93cd1157d2f0ef8f2cb052c48124f866386b /pkgs/development/libraries/science/math/osi/default.nix | |
| parent | d6136b744a75e641d58d56115b1972b7dd1f4884 (diff) | |
| parent | c5406e30b02df521e75c4f5b7de62be322b05810 (diff) | |
| download | nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.gz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.bz2 nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.lz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.xz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.zst nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/libraries/science/math/osi/default.nix')
| -rw-r--r-- | pkgs/development/libraries/science/math/osi/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 1cc80e78a100..6dc7e746fd35 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; NIX_LDFLAGS = - lib.optional withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; + lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; - # Compile errors - NIX_CFLAGS_COMPILE = [ "-Wno-cast-qual" ]; + # Compile errors + NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; hardeningDisable = [ "format" ]; enableParallelBuilding = true; |