diff options
author | Robin Gloster <mail@glob.in> | 2019-10-30 12:34:47 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:16:46 +0100 |
commit | 313da176d35efefbcf36b41ec348c38403581e83 (patch) | |
tree | cd7bba63111f2330601c18f0b2a33b65c3b9bbab /pkgs/development | |
parent | f9f46dc327c7e659e84d558f1309e16e16e8245a (diff) | |
download | nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar.gz nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar.bz2 nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar.lz nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar.xz nixlib-313da176d35efefbcf36b41ec348c38403581e83.tar.zst nixlib-313da176d35efefbcf36b41ec348c38403581e83.zip |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/development')
23 files changed, 30 insertions, 45 deletions
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index dee0b351a609..bdb16c922071 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -14,13 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ - "-lcrypto" - "-lpcre" - "-lreadline" - "-lgc" - "-lsqlite3" - ]; + NIX_LDFLAGS = "-lcrypto -lpcre -lreadline -lgc -lsqlite3"; # we could create a separate derivation for the "written in c" version of nim # used for bootstrapping, but koch insists on moving the nim compiler around diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 1cc96455be7a..e6fdd03bb678 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tabling=yes" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 188058a73b52..9c35fc354976 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex makeWrapper ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; - NIX_LDFLAGS = [ "-lLLVMJIT" ]; + NIX_LDFLAGS = "-lLLVMJIT"; postPatch = '' for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index ec3b4e201477..8c1f3aea4667 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; # needed for 1.116.0 to build with gcc7 - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-implicit-fallthrough" "-Wno-error=clobbered" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b79f940affa3..803906b13437 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 408368b89c40..9fffd3d94770 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index b047322c35e6..0403c7ad10c9 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" ]; - NIX_LDFLAGS = [ "-ldl" ]; + NIX_LDFLAGS = "-ldl"; meta = { description = "Prometheus Client Library for Modern C++"; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 0d9ae21e87e3..83e904e53eb2 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ qt5.qtbase qca2-qt5 ]; nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; - NIX_LDFLAGS = [ "-lqca-qt5" ]; + NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 35d0914e3f76..53ae70f5bf8a 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; preConfigure = '' cd src diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 2708e49eb2b6..83eef355f2db 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ "-lsqlite3" ]; + NIX_LDFLAGS = "-lsqlite3"; meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index a18edc0a6dff..f9f5beb5b65b 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" ]; - NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. + NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. enableParallelBuilding = true; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 78f85afca917..6cfaef5ef993 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -100,16 +100,16 @@ sqlite = stdenv.mkDerivation rec { pname = "sqlite-connector-odbc"; version = "0.9993"; - + src = fetchurl { url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; }; - + buildInputs = [ unixODBC sqlite zlib libxml2 ]; - + configureFlags = [ "--with-odbc=${unixODBC}" ]; - + installTargets = [ "install-3" ]; # move libraries to $out/lib where they're expected to be @@ -117,7 +117,7 @@ mkdir -p "$out/lib" mv "$out"/*.* "$out/lib" ''; - + passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 61246748ac73..5e5f4c9e8ca6 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4e9336172ad9..a02e540173d8 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit # to be exceeded - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; nativeBuildInputs = [ gn ninja pkgconfig python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 945ba59cf3df..3a5b1690f2d0 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" "-Wno-error=deprecated-copy" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; prePatch = lib.optional stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index ba53e8e54451..127ea4f7162b 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.isDarwin) [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation"; buildInputs = [ zookeeper bash ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index dc6b17512837..9bcf4fc411ff 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ba5a527fdb08..8f6c7c54cb2e 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ udev ]; - NIX_CFLAGS_LINK = [ "-ludev" ]; + NIX_CFLAGS_LINK = "-ludev"; meta = with stdenv.lib; { description = "Pythonic API to Linux uinput kernel module"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index cc64e49e1b7a..34282a5ec937 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -266,7 +266,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 8cdcdd6f79d5..0ec4b1510e91 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -16,9 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; - NIX_LDFLAGS = [ - "-lQt5PrintSupport" - ]; + NIX_LDFLAGS = "-lQt5PrintSupport"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index eea27b3e51ff..88f75a3081b9 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" "-Wno-error=tautological-compare" "-Wno-error=array-bounds" - ]; + ]); postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 068028c7da91..d8dab6b03587 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation { }) ]; - NIX_LDFLAGS = [ - "-lpcre" - ]; + NIX_LDFLAGS = "-lpcre"; buildPhase = '' HOME=$TMPDIR diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 931c00ecce58..213c926521fe 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -40,14 +40,9 @@ mkDerivation { ]; # these libraries are only searched for at runtime so we need to force-link them - NIX_LDFLAGS = [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - ]; + NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl"; - NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ]; + NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; qtWrapperArgs = [ ''--prefix PATH : ${lib.getBin graphviz}/bin'' |