lol

treewide: NIX_*_FLAGS -> string

authored by

Robin Gloster and committed by
Jan Tojnar
313da176 f9f46dc3

+107 -157
+1 -1
pkgs/applications/audio/lsp-plugins/default.nix
··· 21 21 "PREFIX=${placeholder ''out''}" 22 22 ]; 23 23 24 - NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ]; 24 + NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; 25 25 26 26 doCheck = true; 27 27
+1 -1
pkgs/applications/audio/pianobooster/default.nix
··· 17 17 preConfigure = "cd src"; 18 18 19 19 buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ]; 20 - NIX_LDFLAGS = [ "-lGL" "-lpthread" ]; 20 + NIX_LDFLAGS = "-lGL -lpthread"; 21 21 22 22 postInstall = '' 23 23 wrapProgram $out/bin/pianobooster \
+1 -3
pkgs/applications/audio/timemachine/default.nix
··· 19 19 20 20 preConfigure = "./autogen.sh"; 21 21 22 - NIX_LDFLAGS = [ 23 - "-lm" 24 - ]; 22 + NIX_LDFLAGS = "-lm"; 25 23 26 24 meta = { 27 25 description = "JACK audio recorder";
+1 -1
pkgs/applications/editors/texmacs/default.nix
··· 49 49 git 50 50 python3 51 51 ]; 52 - NIX_LDFLAGS = [ "-lz" ]; 52 + NIX_LDFLAGS = "-lz"; 53 53 54 54 postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + 55 55 (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
+2 -2
pkgs/applications/graphics/xournal/default.nix
··· 26 26 27 27 nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; 28 28 29 - NIX_LDFLAGS = [ "-lz" ] 30 - ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; 29 + NIX_LDFLAGS = "-lz" 30 + + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; 31 31 32 32 desktopItem = makeDesktopItem { 33 33 name = name;
+1 -1
pkgs/applications/misc/merkaartor/default.nix
··· 18 18 19 19 enableParallelBuilding = true; 20 20 21 - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; 21 + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; 22 22 23 23 postInstall = '' 24 24 wrapProgram $out/bin/merkaartor \
+1 -3
pkgs/applications/misc/mysql-workbench/default.nix
··· 62 62 patchShebangs tools/get_wb_version.sh 63 63 ''; 64 64 65 - NIX_CFLAGS_COMPILE = [ 66 65 # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated 67 - "-Wno-error=deprecated-declarations" 68 - ]; 66 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; 69 67 70 68 cmakeFlags = [ 71 69 "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
+2 -2
pkgs/applications/misc/navit/default.nix
··· 35 35 36 36 patches = [ ./CMakeLists.txt.patch ]; 37 37 38 - NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" 39 - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; 38 + NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" 39 + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); 40 40 41 41 # we choose only cmdline and speech-dispatcher speech options. 42 42 # espeak builtins is made for non-cmdline OS as winCE
+1 -1
pkgs/applications/misc/netsurf/libcss/default.nix
··· 27 27 "NSSHARED=${buildsystem}/share/netsurf-buildsystem" 28 28 ]; 29 29 30 - NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ]; 30 + NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; 31 31 32 32 meta = with stdenv.lib; { 33 33 homepage = http://www.netsurf-browser.org/;
+1 -1
pkgs/applications/misc/osm2xmap/default.nix
··· 19 19 "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" 20 20 ]; 21 21 22 - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; 22 + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; 23 23 24 24 buildInputs = [ libroxml proj libyamlcpp boost ]; 25 25
+1 -1
pkgs/applications/misc/tangogps/default.nix
··· 11 11 12 12 nativeBuildInputs = [ pkgconfig ]; 13 13 buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; 14 - NIX_LDFLAGS = [ "-lm" ]; 14 + NIX_LDFLAGS = "-lm"; 15 15 16 16 # bogus includes fail with newer library version 17 17 postPatch = ''
+1 -1
pkgs/applications/misc/xsw/default.nix
··· 18 18 19 19 buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; 20 20 21 - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]; 21 + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); 22 22 23 23 patches = [ 24 24 ./parse.patch # Fixes compilation error by avoiding redundant definitions.
+2 -2
pkgs/applications/networking/feedreaders/newsboat/default.nix
··· 31 31 make 32 32 ''; 33 33 34 - NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ] 35 - ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security"; 34 + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" 35 + + stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; 36 36 37 37 doCheck = true; 38 38
+1 -1
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
··· 11 11 sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; 12 12 }; 13 13 14 - NIX_CFLAGS_COMPILE = [ 14 + NIX_CFLAGS_COMPILE = builtins.toString [ 15 15 # glib-2.62 deprecations 16 16 "-DGLIB_DISABLE_DEPRECATION_WARNINGS" 17 17 # override "-O0 -Werror" set by build system
+1 -1
pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
··· 13 13 sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; 14 14 }; 15 15 16 - NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; 16 + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; 17 17 18 18 nativeBuildInputs = [ pkgconfig ]; 19 19 buildInputs = [ pidgin libwebp libgcrypt gettext ];
+1 -1
pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
··· 16 16 patches = [ ./conference.patch ]; 17 17 18 18 buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ]; 19 - NIX_LDFLAGS = [ "-lvorbis" ]; 19 + NIX_LDFLAGS = "-lvorbis"; 20 20 21 21 meta = { 22 22 homepage = http://atdot.ch/scr/;
+1 -1
pkgs/applications/networking/instant-messengers/swift-im/default.nix
··· 23 23 24 24 propagatedUserEnvPkgs = [ GConf ]; 25 25 26 - NIX_CFLAGS_COMPILE = [ 26 + NIX_CFLAGS_COMPILE = toString [ 27 27 "-I${libxml2.dev}/include/libxml2" 28 28 "-I${miniupnpc}/include/miniupnpc" 29 29 "-I${qtwebkit.dev}/include/QtWebKit"
+1 -1
pkgs/applications/networking/irc/quassel/default.nix
··· 46 46 enableParallelBuilding = true; 47 47 48 48 # Prevent ``undefined reference to `qt_version_tag''' in SSL check 49 - NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; 49 + NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; 50 50 51 51 buildInputs = 52 52 [ cmake makeWrapper qtbase ]
+1 -1
pkgs/applications/networking/remote/putty/default.nix
··· 15 15 }; 16 16 17 17 # glib-2.62 deprecations 18 - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; 18 + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; 19 19 20 20 preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' 21 21 perl mkfiles.pl
+1 -1
pkgs/applications/office/planner/default.nix
··· 46 46 ]; 47 47 48 48 # glib-2.62 deprecations 49 - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; 49 + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; 50 50 51 51 preConfigure = ''./autogen.sh''; 52 52 configureFlags = [
+1 -3
pkgs/applications/radio/gnuradio/default.nix
··· 50 50 Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl 51 51 ]; 52 52 53 - NIX_LDFLAGS = [ 54 - "-lpthread" 55 - ]; 53 + NIX_LDFLAGS = "-lpthread"; 56 54 57 55 enableParallelBuilding = true; 58 56
+1 -1
pkgs/applications/radio/xlog/default.nix
··· 9 9 }; 10 10 11 11 # glib-2.62 deprecations 12 - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; 12 + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; 13 13 14 14 buildInputs = [ glib pkgconfig gtk2 hamlib ]; 15 15
+1 -1
pkgs/applications/virtualization/open-vm-tools/default.nix
··· 46 46 47 47 enableParallelBuilding = true; 48 48 49 - NIX_CFLAGS_COMPILE = [ 49 + NIX_CFLAGS_COMPILE = builtins.toString [ 50 50 # igrone glib-2.62 deprecations 51 51 # Drop in next stable release. 52 52 "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
+1 -1
pkgs/applications/virtualization/xen/4.10.nix
··· 148 148 ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" 149 149 ++ optional (withInternalOVMF) "--enable-ovmf"; 150 150 151 - NIX_CFLAGS_COMPILE = [ 151 + NIX_CFLAGS_COMPILE = toString [ 152 152 # Fix build on Glibc 2.24. 153 153 "-Wno-error=deprecated-declarations" 154 154 # Fix build with GCC 8
+1 -3
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
··· 148 148 "-Dudev_dir=${placeholder "out"}/lib/udev" 149 149 ]; 150 150 151 - NIX_CFLAGS_COMPILE = [ 152 151 # Default for release buildtype but passed manually because 153 152 # we're using plain 154 - "-DG_DISABLE_CAST_CHECKS" 155 - ]; 153 + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; 156 154 157 155 passthru = { 158 156 updateScript = gnome3.updateScript {
+1 -1
pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
··· 9 9 10 10 nativeBuildInputs = [ automakeAddFlags ]; 11 11 12 - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0" ]; 12 + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; 13 13 14 14 postPatch = '' 15 15 substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
+1 -7
pkgs/development/compilers/nim/default.nix
··· 14 14 15 15 enableParallelBuilding = true; 16 16 17 - NIX_LDFLAGS = [ 18 - "-lcrypto" 19 - "-lpcre" 20 - "-lreadline" 21 - "-lgc" 22 - "-lsqlite3" 23 - ]; 17 + NIX_LDFLAGS = "-lcrypto -lpcre -lreadline -lgc -lsqlite3"; 24 18 25 19 # we could create a separate derivation for the "written in c" version of nim 26 20 # used for bootstrapping, but koch insists on moving the nim compiler around
+1 -1
pkgs/development/compilers/yap/default.nix
··· 13 13 14 14 configureFlags = [ "--enable-tabling=yes" ]; 15 15 16 - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; 16 + NIX_CFLAGS_COMPILE = "-fpermissive"; 17 17 18 18 meta = { 19 19 homepage = http://www.dcc.fc.up.pt/~vsc/Yap/;
+1 -1
pkgs/development/interpreters/pure/default.nix
··· 13 13 14 14 buildInputs = [ bison flex makeWrapper ]; 15 15 propagatedBuildInputs = [ llvm gmp mpfr readline ]; 16 - NIX_LDFLAGS = [ "-lLLVMJIT" ]; 16 + NIX_LDFLAGS = "-lLLVMJIT"; 17 17 18 18 postPatch = '' 19 19 for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do
+1 -1
pkgs/development/libraries/mps/default.nix
··· 13 13 buildInputs = [ sqlite ]; 14 14 15 15 # needed for 1.116.0 to build with gcc7 16 - NIX_CFLAGS_COMPILE = [ 16 + NIX_CFLAGS_COMPILE = toString [ 17 17 "-Wno-implicit-fallthrough" 18 18 "-Wno-error=clobbered" 19 19 "-Wno-error=cast-function-type"
+1 -1
pkgs/development/libraries/ntrack/default.nix
··· 18 18 nativeBuildInputs = [ pkgconfig python ]; 19 19 20 20 # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] 21 - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; 21 + NIX_CFLAGS_COMPILE = "-Wno-error"; 22 22 23 23 configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; 24 24
+1 -1
pkgs/development/libraries/opencv/4.x.nix
··· 221 221 222 222 nativeBuildInputs = [ cmake pkgconfig unzip ]; 223 223 224 - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; 224 + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; 225 225 226 226 # Configure can't find the library without this. 227 227 OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
+1 -1
pkgs/development/libraries/prometheus-cpp/default.nix
··· 30 30 "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" 31 31 ]; 32 32 33 - NIX_LDFLAGS = [ "-ldl" ]; 33 + NIX_LDFLAGS = "-ldl"; 34 34 35 35 meta = { 36 36 description = "Prometheus Client Library for Modern C++";
+2 -2
pkgs/development/libraries/qoauth/default.nix
··· 18 18 buildInputs = [ qt5.qtbase qca2-qt5 ]; 19 19 nativeBuildInputs = [ qt5.qmake ]; 20 20 21 - NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; 22 - NIX_LDFLAGS = [ "-lqca-qt5" ]; 21 + NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; 22 + NIX_LDFLAGS = "-lqca-qt5"; 23 23 24 24 meta = with stdenv.lib; { 25 25 description = "Qt library for OAuth authentication";
+1 -1
pkgs/development/libraries/science/benchmark/papi/default.nix
··· 11 11 sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; 12 12 }; 13 13 14 - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; 14 + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; 15 15 16 16 preConfigure = '' 17 17 cd src
+1 -1
pkgs/development/libraries/spatialite-tools/default.nix
··· 15 15 16 16 enableParallelBuilding = true; 17 17 18 - NIX_LDFLAGS = [ "-lsqlite3" ]; 18 + NIX_LDFLAGS = "-lsqlite3"; 19 19 20 20 meta = { 21 21 description = "A complete sqlite3-compatible CLI front-end for libspatialite";
+1 -1
pkgs/development/libraries/spdk/default.nix
··· 21 21 22 22 configureFlags = [ "--with-dpdk=${dpdk}" ]; 23 23 24 - NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. 24 + NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. 25 25 26 26 enableParallelBuilding = true; 27 27
+5 -5
pkgs/development/libraries/unixODBCDrivers/default.nix
··· 100 100 sqlite = stdenv.mkDerivation rec { 101 101 pname = "sqlite-connector-odbc"; 102 102 version = "0.9993"; 103 - 103 + 104 104 src = fetchurl { 105 105 url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; 106 106 sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; 107 107 }; 108 - 108 + 109 109 buildInputs = [ unixODBC sqlite zlib libxml2 ]; 110 - 110 + 111 111 configureFlags = [ "--with-odbc=${unixODBC}" ]; 112 - 112 + 113 113 installTargets = [ "install-3" ]; 114 114 115 115 # move libraries to $out/lib where they're expected to be ··· 117 117 mkdir -p "$out/lib" 118 118 mv "$out"/*.* "$out/lib" 119 119 ''; 120 - 120 + 121 121 passthru = { 122 122 fancyName = "SQLite"; 123 123 driver = "lib/libsqlite3odbc.so";
+1 -1
pkgs/development/libraries/uri/default.nix
··· 11 11 sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; 12 12 }; 13 13 14 - NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ]; 14 + NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; 15 15 16 16 nativeBuildInputs = [ cmake doxygen ]; 17 17
+1 -1
pkgs/development/libraries/v8/default.nix
··· 99 99 100 100 # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit 101 101 # to be exceeded 102 - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; 102 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; 103 103 104 104 nativeBuildInputs = [ gn ninja pkgconfig python ] 105 105 ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
+1 -1
pkgs/development/libraries/zeroc-ice/default.nix
··· 32 32 buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] 33 33 ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; 34 34 35 - NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" "-Wno-error=deprecated-copy" ]; 35 + NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; 36 36 37 37 prePatch = lib.optional stdenv.isDarwin '' 38 38 substituteInPlace Make.rules.Darwin \
+1 -1
pkgs/development/libraries/zookeeper_mt/default.nix
··· 7 7 8 8 setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; 9 9 10 - NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.isDarwin) [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ]; 10 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation"; 11 11 12 12 buildInputs = [ zookeeper bash ]; 13 13
+1 -1
pkgs/development/ocaml-modules/curses/default.nix
··· 14 14 buildInputs = [ ocaml findlib ]; 15 15 16 16 # Fix build for recent ncurses versions 17 - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; 17 + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; 18 18 19 19 createFindlibDestdir = true; 20 20
+1 -1
pkgs/development/python-modules/python-uinput/default.nix
··· 12 12 13 13 buildInputs = [ udev ]; 14 14 15 - NIX_CFLAGS_LINK = [ "-ludev" ]; 15 + NIX_CFLAGS_LINK = "-ludev"; 16 16 17 17 meta = with stdenv.lib; { 18 18 description = "Pythonic API to Linux uinput kernel module";
+1 -1
pkgs/development/python-modules/tensorflow/default.nix
··· 266 266 ''; 267 267 268 268 # FIXME: Tensorflow uses dlopen() for CUDA libraries. 269 - NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; 269 + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; 270 270 271 271 hardeningDisable = [ "format" ]; 272 272
+1 -3
pkgs/development/tools/database/sqlitebrowser/default.nix
··· 16 16 17 17 nativeBuildInputs = [ cmake qttools ]; 18 18 19 - NIX_LDFLAGS = [ 20 - "-lQt5PrintSupport" 21 - ]; 19 + NIX_LDFLAGS = "-lQt5PrintSupport"; 22 20 23 21 enableParallelBuilding = true; 24 22
+2 -2
pkgs/development/tools/misc/openocd/default.nix
··· 25 25 "--enable-remote-bitbang" 26 26 ]; 27 27 28 - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ 28 + NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ 29 29 "-Wno-implicit-fallthrough" 30 30 "-Wno-format-truncation" 31 31 "-Wno-format-overflow" 32 32 "-Wno-error=tautological-compare" 33 33 "-Wno-error=array-bounds" 34 - ]; 34 + ]); 35 35 36 36 postInstall = lib.optionalString stdenv.isLinux '' 37 37 mkdir -p "$out/etc/udev/rules.d"
+1 -3
pkgs/development/tools/nrpl/default.nix
··· 21 21 }) 22 22 ]; 23 23 24 - NIX_LDFLAGS = [ 25 - "-lpcre" 26 - ]; 24 + NIX_LDFLAGS = "-lpcre"; 27 25 28 26 buildPhase = '' 29 27 HOME=$TMPDIR
+2 -7
pkgs/development/tools/tora/default.nix
··· 40 40 ]; 41 41 42 42 # these libraries are only searched for at runtime so we need to force-link them 43 - NIX_LDFLAGS = [ 44 - "-lgvc" 45 - "-lmysqlclient" 46 - "-lecpg" 47 - "-lssl" 48 - ]; 43 + NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl"; 49 44 50 - NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ]; 45 + NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; 51 46 52 47 qtWrapperArgs = [ 53 48 ''--prefix PATH : ${lib.getBin graphviz}/bin''
+1 -1
pkgs/games/0ad/game.nix
··· 26 26 nvidia-texture-tools libsodium 27 27 ] ++ lib.optional withEditor wxGTK; 28 28 29 - NIX_CFLAGS_COMPILE = [ 29 + NIX_CFLAGS_COMPILE = toString [ 30 30 "-I${xorgproto}/include/X11" 31 31 "-I${libX11.dev}/include/X11" 32 32 "-I${libXcursor.dev}/include/X11"
+1 -1
pkgs/games/macopix/default.nix
··· 18 18 19 19 enableParallelBuilding = true; 20 20 21 - NIX_LDFLAGS = [ "-lX11" ]; 21 + NIX_LDFLAGS = "-lX11"; 22 22 23 23 meta = { 24 24 description = "Mascot Constructive Pilot for X";
+1 -1
pkgs/games/minetest/default.nix
··· 40 40 "-DOpenGL_GL_PREFERENCE=GLVND" 41 41 ]; 42 42 43 - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 43 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 44 44 45 45 nativeBuildInputs = [ cmake doxygen graphviz ]; 46 46
+1 -1
pkgs/games/onscripter-en/default.nix
··· 19 19 configureFlags = [ "--no-werror" ]; 20 20 21 21 # Without this libvorbisfile.so is not getting linked properly for some reason. 22 - NIX_CFLAGS_LINK = [ "-lvorbisfile" ]; 22 + NIX_CFLAGS_LINK = "-lvorbisfile"; 23 23 24 24 preBuild = '' 25 25 sed -i 's/.dll//g' Makefile
+1 -3
pkgs/games/opendungeons/default.nix
··· 15 15 16 16 nativeBuildInputs = [ pkgconfig ]; 17 17 buildInputs = [ cmake ogre cegui boost sfml openal ois ]; 18 - NIX_LDFLAGS = [ 19 - "-lpthread" 20 - ]; 18 + NIX_LDFLAGS = "-lpthread"; 21 19 22 20 meta = with stdenv.lib; { 23 21 description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius.";
+1 -1
pkgs/games/openspades/default.nix
··· 57 57 58 58 enableParallelBuilding = true; 59 59 60 - NIX_CFLAGS_LINK = [ "-lopenal" ]; 60 + NIX_CFLAGS_LINK = "-lopenal"; 61 61 62 62 meta = with stdenv.lib; { 63 63 description = "A compatible client of Ace of Spades 0.75";
+1 -1
pkgs/games/pokerth/default.nix
··· 60 60 "pokerth.pro" 61 61 ]; 62 62 63 - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; 63 + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; 64 64 65 65 enableParallelBuilding = true; 66 66
+1 -1
pkgs/games/rogue/default.nix
··· 15 15 buildInputs = [ ncurses ]; 16 16 17 17 # Fix build for recent ncurses versions 18 - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; 18 + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; 19 19 20 20 meta = with stdenv.lib; { 21 21 homepage = http://rogue.rogueforge.net/rogue-5-4/;
+1 -1
pkgs/games/scorched3d/default.nix
··· 28 28 29 29 configureFlags = [ "--with-fftw=${fftwSinglePrec.dev}" ]; 30 30 31 - NIX_LDFLAGS = [ "-lopenal" ]; 31 + NIX_LDFLAGS = "-lopenal"; 32 32 33 33 meta = with stdenv.lib; { 34 34 homepage = http://scorched3d.co.uk/;
+1 -1
pkgs/games/tdm/default.nix
··· 91 91 92 92 enableParallelBuilding = true; 93 93 sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; 94 - NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"]; 94 + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; 95 95 meta = with stdenv.lib; { 96 96 description = "The Dark Mod - stealth FPS inspired by the Thief series"; 97 97 homepage = "http://www.thedarkmod.com";
+1 -5
pkgs/games/tome4/default.nix
··· 41 41 # disable parallel building as it caused sporadic build failures 42 42 enableParallelBuilding = false; 43 43 44 - NIX_CFLAGS_COMPILE = [ 45 - "-I${SDL2.dev}/include/SDL2" 46 - "-I${SDL2_image}/include/SDL2" 47 - "-I${SDL2_ttf}/include/SDL2" 48 - ]; 44 + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; 49 45 50 46 makeFlags = [ "config=release" ]; 51 47
+1 -1
pkgs/games/xbill/default.nix
··· 6 6 7 7 buildInputs = [ libX11 libXpm libXt motif ]; 8 8 9 - NIX_CFLAGS_LINK = [ "-lXpm" ]; 9 + NIX_CFLAGS_LINK = "-lXpm"; 10 10 11 11 configureFlags = [ 12 12 "--with-x"
+3 -9
pkgs/games/zoom/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "zoom-1.1.5"; 7 - 7 + 8 8 src = fetchurl { 9 9 url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; 10 10 sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; 11 11 }; 12 - 12 + 13 13 buildInputs = [ perl expat xlibsWrapper freetype ]; 14 - 15 - NIX_CFLAGS_COMPILE = [ 16 - # Zoom doesn't add the right directory in the include path. 17 - "-I" (freetype + "/include/freetype2") 18 14 19 - # for gcc5; c11 inline semantics breaks the build 20 - "-fgnu89-inline" 21 - ]; 15 + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; 22 16 23 17 meta = with stdenv.lib; { 24 18 description = "Player for Z-Code, TADS and HUGO stories or games";
+1 -5
pkgs/misc/drivers/utsushi/default.nix
··· 26 26 libusb.dev 27 27 ]; 28 28 29 - NIX_CFLAGS_COMPILE = [ 30 - "-Wno-error=deprecated-declarations" 31 - "-Wno-error=parentheses" 32 - "-Wno-error=unused-variable" 33 - ]; 29 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; 34 30 35 31 postPatch = '' 36 32 # remove vendored dependencies
+1 -1
pkgs/os-specific/linux/tiptop/default.nix
··· 22 22 nativeBuildInputs = [ flex bison ]; 23 23 buildInputs = [ libxml2 ncurses ]; 24 24 25 - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; 25 + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; 26 26 27 27 meta = with stdenv.lib; { 28 28 description = "Performance monitoring tool for Linux";
+1 -1
pkgs/os-specific/linux/usermount/default.nix
··· 12 12 nativeBuildInputs = [ pkgconfig ]; 13 13 buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; 14 14 15 - NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; 15 + NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin
+1 -1
pkgs/servers/amqp/qpid-cpp/default.nix
··· 33 33 sed -i '/management/d' CMakeLists.txt 34 34 ''; 35 35 36 - NIX_CFLAGS_COMPILE = [ 36 + NIX_CFLAGS_COMPILE = toString [ 37 37 "-Wno-error=deprecated-declarations" 38 38 "-Wno-error=int-in-bool-context" 39 39 "-Wno-error=maybe-uninitialized"
+1 -3
pkgs/servers/computing/torque/default.nix
··· 25 25 enableParallelBuilding = true; 26 26 27 27 # added to fix build with gcc7 28 - NIX_CFLAGS_COMPILE = [ 29 - "-Wno-error" "-fpermissive" 30 - ]; 28 + NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; 31 29 32 30 postPatch = '' 33 31 substituteInPlace Makefile.am \
+1 -1
pkgs/servers/http/openresty/default.nix
··· 15 15 buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; 16 16 nativeBuildInputs = [ perl ]; 17 17 18 - NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"]; 18 + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; 19 19 20 20 preConfigure = '' 21 21 patchShebangs .
+2 -4
pkgs/servers/http/tengine/default.nix
··· 84 84 ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" 85 85 ++ map (mod: "--add-module=${mod.src}") modules; 86 86 87 - NIX_CFLAGS_COMPILE = [ 88 - "-I${libxml2.dev}/include/libxml2" 89 - "-Wno-error=implicit-fallthrough" 90 - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; 87 + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" 88 + + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; 91 89 92 90 preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); 93 91
+3 -4
pkgs/servers/mail/opensmtpd/extras.nix
··· 76 76 "--with-table-redis" 77 77 ]; 78 78 79 - NIX_CFLAGS_COMPILE = 80 - stdenv.lib.optional enableRedis 79 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis 81 80 "-I${hiredis}/include/hiredis -lhiredis" 82 - ++ stdenv.lib.optional enableMysql 83 - "-L${libmysqlclient}/lib/mysql"; 81 + + stdenv.lib.optionalString enableMysql 82 + " -L${libmysqlclient}/lib/mysql"; 84 83 85 84 meta = with stdenv.lib; { 86 85 homepage = https://www.opensmtpd.org/;
+1 -1
pkgs/servers/mail/postfix/default.nix
··· 79 79 make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' 80 80 ''; 81 81 82 - NIX_LDFLAGS = lib.optional withLDAP "-llber"; 82 + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; 83 83 84 84 installTargets = [ "non-interactive-package" ]; 85 85
+1 -1
pkgs/servers/nosql/mongodb/default.nix
··· 66 66 --replace 'engine("wiredTiger")' 'engine("mmapv1")' 67 67 ''; 68 68 69 - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; 69 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; 70 70 71 71 sconsFlags = [ 72 72 "--release"
+1 -3
pkgs/tools/X11/xpra/default.nix
··· 60 60 ipaddress idna 61 61 ]; 62 62 63 - NIX_CFLAGS_COMPILE = [ 64 63 # error: 'import_cairo' defined but not used 65 - "-Wno-error=unused-function" 66 - ]; 64 + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; 67 65 68 66 setupPyBuildFlags = [ 69 67 "--with-Xdummy"
+1 -1
pkgs/tools/misc/osm2pgsql/default.nix
··· 15 15 16 16 buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; 17 17 18 - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; 18 + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; 19 19 20 20 meta = with stdenv.lib; { 21 21 description = "OpenStreetMap data to PostgreSQL converter";
+1 -1
pkgs/tools/misc/parcellite/default.nix
··· 15 15 16 16 nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; 17 17 buildInputs = [ gtk2 hicolor-icon-theme ]; 18 - NIX_LDFLAGS = [ "-lgio-2.0" ]; 18 + NIX_LDFLAGS = "-lgio-2.0"; 19 19 20 20 preFixup = '' 21 21 # Need which and xdotool on path to fix auto-pasting.
+1 -1
pkgs/tools/misc/qjoypad/default.nix
··· 7 7 }; 8 8 nativeBuildInputs = [ pkgconfig ]; 9 9 buildInputs = [ libX11 libXtst qt4 ]; 10 - NIX_LDFLAGS = [ "-lX11" ]; 10 + NIX_LDFLAGS = "-lX11"; 11 11 patchPhase = '' 12 12 cd src 13 13 substituteInPlace config --replace /bin/bash ${stdenv.shell}
+1 -3
pkgs/tools/misc/snapper/default.nix
··· 49 49 50 50 enableParallelBuilding = true; 51 51 52 - NIX_CFLAGS_COMPILE = [ 53 - "-I${libxml2.dev}/include/libxml2" 54 - ]; 52 + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; 55 53 56 54 postInstall = '' 57 55 rm -r $out/etc/cron.*
+1 -1
pkgs/tools/misc/wyrd/default.nix
··· 9 9 sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; 10 10 }; 11 11 12 - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; 12 + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; 13 13 14 14 preConfigure = '' 15 15 substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
+1 -1
pkgs/tools/networking/libreswan/default.nix
··· 26 26 }; 27 27 28 28 # These flags were added to compile v3.18. Try to lift them when updating. 29 - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" 29 + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" 30 30 # these flags were added to build with gcc7 31 31 "-Wno-error=implicit-fallthrough" 32 32 "-Wno-error=format-truncation"
+1 -1
pkgs/tools/networking/network-manager/strongswan.nix
··· 15 15 nativeBuildInputs = [ intltool pkgconfig ]; 16 16 17 17 # glib-2.62 deprecations 18 - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; 18 + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; 19 19 20 20 configureFlags = [ 21 21 "--without-libnm-glib"
+2 -2
pkgs/tools/networking/ntopng/default.nix
··· 54 54 sed 's|LIBS += -lstdc++.6||' -i Makefile 55 55 ''; 56 56 57 - NIX_CFLAGS_COMPILE = [ "-fpermissive" ] 58 - ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; 57 + NIX_CFLAGS_COMPILE = "-fpermissive" 58 + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; 59 59 60 60 meta = with stdenv.lib; { 61 61 description = "High-speed web-based traffic analysis and flow collection tool";
+1 -1
pkgs/tools/networking/ssmtp/default.nix
··· 36 36 37 37 buildInputs = stdenv.lib.optional tlsSupport openssl; 38 38 39 - NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ]; 39 + NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; 40 40 41 41 meta = with stdenv.lib; { 42 42 platforms = platforms.linux;
+1 -1
pkgs/tools/networking/tracebox/default.nix
··· 14 14 15 15 configureFlags = [ "--with-lua=yes" ]; 16 16 17 - NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ]; 17 + NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so"; 18 18 19 19 preAutoreconf = '' 20 20 substituteInPlace Makefile.am --replace "noinst" ""
+3 -3
pkgs/tools/networking/wrk/default.nix
··· 22 22 done 23 23 ''; 24 24 25 - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 26 - 25 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 26 + 27 27 installPhase = '' 28 28 mkdir -p $out/bin 29 29 cp wrk $out/bin 30 30 ''; 31 - 31 + 32 32 meta = with stdenv.lib; { 33 33 description = "HTTP benchmarking tool"; 34 34 homepage = https://github.com/wg/wrk;
+1 -1
pkgs/tools/package-management/xbps/default.nix
··· 17 17 18 18 patches = [ ./cert-paths.patch ]; 19 19 20 - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; 20 + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; 21 21 22 22 postPatch = '' 23 23 # fix unprefixed ranlib (needed on cross)
+1 -1
pkgs/tools/system/netdata/default.nix
··· 34 34 ./no-files-in-etc-and-var.patch 35 35 ]; 36 36 37 - NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; 37 + NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; 38 38 39 39 postInstall = optionalString (!stdenv.isDarwin) '' 40 40 # rename this plugin so netdata will look for setuid wrapper
+1 -1
pkgs/tools/system/rowhammer-test/default.nix
··· 10 10 sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; 11 11 }; 12 12 13 - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isi686 "-Wno-error=format"; 13 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; 14 14 15 15 buildPhase = "sh -e make.sh"; 16 16
+1 -1
pkgs/tools/system/stress-ng/default.nix
··· 28 28 "BASHDIR=${placeholder "out"}/share/bash-completion/completions" 29 29 ]; 30 30 31 - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; 31 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; 32 32 33 33 # Won't build on i686 because the binary will be linked again in the 34 34 # install phase without checking the dependencies. This will prevent
+1 -3
pkgs/tools/text/multitran/libmtquery/default.nix
··· 9 9 10 10 buildInputs = [ libmtsupport libfacet libbtree multitrandata ]; 11 11 12 - NIX_LDFLAGS = [ 13 - "-lbtree" 14 - ]; 12 + NIX_LDFLAGS = "-lbtree"; 15 13 16 14 patchPhase = '' 17 15 sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \