treewide: NIX_*_FLAGS -> string

This commit is contained in:
Robin Gloster 2019-10-30 03:23:29 +01:00 committed by Jan Tojnar
parent 5f2b92e3ec
commit f9f46dc327
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
47 changed files with 63 additions and 94 deletions

View File

@ -7,11 +7,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
NIX_LDFLAGS = [
"-ldl"
"-lm"
"-lpthread"
];
NIX_LDFLAGS = "-ldl -lm -lpthread";
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = [ "-ldl" ];
NIX_LDFLAGS = "-ldl";
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa

View File

@ -18,11 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
pkgconfig readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = [
"-lm"
"-lpthread"
"-luuid"
];
NIX_LDFLAGS = "-lm -lpthread -luuid";
postInstall = ''
for i in lash_control lash_panel

View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
'';
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
installFlags = [
"localstatedir=\${TMPDIR}"

View File

@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
done
'';
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
postInstall = ''
wrapProgram $out/bin/grass76 \

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
nativeBuildInputs = [ pkgconfig ];

View File

@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
buildInputs = [ glfw3 gtk3 libpng12 ];
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
buildPhase = ''
make release

View File

@ -18,9 +18,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
NIX_LDFLAGS = [
"-lm"
];
NIX_LDFLAGS = "-lm";
meta = with stdenv.lib; {
description = "A fast image viewer";

View File

@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
#doCheck = false;
NIX_CFLAGS_COMPILE = [
"-Wno-deprecated-declarations"
];
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
meta = with stdenv.lib; {
description = "A 3D editor with support for procedural editing";

View File

@ -31,7 +31,7 @@ in mkDerivation rec {
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
NIX_LDFLAGS = [ "-lz" ];
NIX_LDFLAGS = "-lz";
qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
meta = {
description = "GTK-based audio CD player/ripper";

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [

View File

@ -65,9 +65,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
installPhase = ''
install -D -m 755 k2pdfopt $out/bin/k2pdfopt

View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ dconf ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
patches = [ ./cmake_check_symbol_exists.patch ];

View File

@ -100,9 +100,9 @@ stdenv.mkDerivation rec {
];
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [
NIX_LDFLAGS = toString [
"-lx265"
# NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
# NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
"-ldl"
];

View File

@ -71,10 +71,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
NIX_LDFLAGS = [
"-lavcodec"
"-lavutil"
];
NIX_LDFLAGS = "-lavcodec -lavutil";
patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ];

View File

@ -69,13 +69,13 @@ let
separateDebugInfo = true;
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = lib.optionals (!headless) [
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
]);
buildFlags = [ "all" ];

View File

@ -84,7 +84,7 @@ in makePackage {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
stripDebugList = [ "." ];

View File

@ -115,18 +115,18 @@ self: super: builtins.intersectAttrs super {
hzk = overrideCabal super.hzk (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ];
});
haskakafka = overrideCabal super.haskakafka (drv: {
preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ];
});
# library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32
hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ];
}));
# Foreign dependency name clashes with another Haskell package.

View File

@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
# Needed with GCC 8
NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [
NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [
"-Wno-error=int-in-bool-context"
"-Wno-error=class-memaccess"
"-Wno-error=restrict"
"-Wno-error=format-truncation"
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference";
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"

View File

@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
"--ipv6"
];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]);
enableParallelBuilding = true;

View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
} || true
'';
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-I${SDL.dev}/include/SDL"
"-I${freetype.dev}include/freetype2"
"-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
"--with-lua=luajit"
];
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
meta = {
homepage = http://love2d.org;

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error
NIX_CFLAGS_COMPILE = [ "-fno-lto" ];
NIX_CFLAGS_COMPILE = "-fno-lto";
meta = with stdenv.lib; {
description = "CBOR protocol implementation for C and others";

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
];
# added to fix build with gcc7+
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = builtins.toString [
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
"-Wno-error=tautological-compare"

View File

@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXi libXtst xorgproto ];
NIX_LDFLAGS = [
"-lX11"
];
NIX_LDFLAGS = "-lX11";
meta = with stdenv.lib; {
description = "X virtual keyboard library";

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
# Darwin gets misdetected as Windows without this
NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix";
patches = [
(fetchpatch {

View File

@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libXft libICE pango libjpeg ];
propagatedBuildInputs = [ libX11 libXext libpng ];
NIX_LDFLAGS = [
"-lX11"
];
NIX_LDFLAGS = "-lX11";
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost librevenge zlib ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; # newly detected by gcc-7
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
meta = with stdenv.lib; {
homepage = http://libwps.sourceforge.net/;

View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
ortp libv4l libpcap srtp bctoolbox libXext libmatroska
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-DGIT_VERSION=\"v${version}\""
"-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type"

View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# mlt is unable to cope with our multi-prefix Qt build
# because it does not use CMake or qmake.
NIX_CFLAGS_COMPILE = [ "-I${getDev qtsvg}/include/QtSvg" ];
NIX_CFLAGS_COMPILE = "-I${getDev qtsvg}/include/QtSvg";
CXXFLAGS = "-std=c++11";

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
configureFlags = [ "--enable-soap" ];
# otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
NIX_LDFLAGS = [ "-lgcrypt" ];
NIX_LDFLAGS = "-lgcrypt";
postInstall = ''
moveToOutput "bin/xmlsec1-config" "$dev"

View File

@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = [ "-pthread" ];
NIX_CFLAGS_COMPILE = "-pthread";
shellHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH

View File

@ -21,7 +21,7 @@ let
configureFlags = [ "--with-colm=${colm}" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98";
doCheck = true;

View File

@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ SDL SDL_image SDL_mixer ];
NIX_LDFLAGS = [
"-lm"
];
NIX_LDFLAGS = "-lm";
meta = with stdenv.lib; {
homepage = https://jump.gnu.sinusoid.es/index.php?title=Main_Page;

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ];
NIX_CFLAGS_LINK = "-lopenal -lfluidsynth";
preConfigure = ''
sed -i \

View File

@ -71,12 +71,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
# Wine locates a lot of libraries dynamically through dlopen(). Add
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath " + path) (
NIX_LDFLAGS = toString (map (path: "-rpath " + path) (
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
# libpulsecommon.so is linked but not found otherwise
++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
(toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
);
));
# Don't shrink the ELF RPATHs in order to keep the extra RPATH
# elements specified above.

View File

@ -46,13 +46,13 @@ stdenv.mkDerivation {
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
NIX_CFLAGS_COMPILE =
[ "-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation"
];
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation"
];
doCheck = false; # requires "sparse"
doInstallCheck = false; # same

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
preConfigure = ''
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
RTE_TARGET = "x86_64-native-linuxapp-gcc";
GUI = stdenv.lib.optionalString withGtk "true";
NIX_CFLAGS_COMPILE = [ "-msse3" ];
NIX_CFLAGS_COMPILE = "-msse3";
postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu

View File

@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
# needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = [
"-DluaL_reg=luaL_Reg"
"-DluaL_getn(L,i)=((int)lua_objlen(L,i))"
];
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
preConfigure = ''
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl")

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
makeFlags = [ "PREFIX=$(out)" ];
NIX_CFLAGS_COMPILE = [ "-D_POSIX_C_SOURCE" ];
NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE";
meta = {
description = "A simple and lightweight volume icon that sits in your system tray";

View File

@ -30,11 +30,8 @@ in rec {
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
NIX_CFLAGS_COMPILE = [
# fix build with recent llvm versions
"-Wno-deprecated-register"
"-Wno-deprecated-declarations"
];
# fix build with recent llvm versions
NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
preConfigure = common.preConfigure + ''
patchShebangs ./test

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
configureScript = "sh autogen.sh";

View File

@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
cp gpgstats $out/bin
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit)
[ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit)
"-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";
meta = with stdenv.lib; {
description = "Calculates statistics on the keys in your gpg key-ring";

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnum4 ];
NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ];
NIX_CFLAGS_COMPILE = "-Wno-deprecated";
preInstall = ''
install -d -m755 "$out"/lib

View File

@ -19245,7 +19245,7 @@ let
sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7";
};
# https://rt.cpan.org/Public/Bug/Display.html?id=124815
NIX_CFLAGS_COMPILE = [ "-DHAS_VPRINTF" ];
NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
};
TextUnidecode = buildPerlPackage {
@ -20332,7 +20332,7 @@ let
AUTOMATED_TESTING = false;
buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ];
propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ];
NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ];
NIX_CFLAGS_LINK = "-lxcb -lxcb-util -lxcb-xinerama -lxcb-icccm";
doCheck = false; # requires an X server
meta = {
description = "XCB bindings for X";