treewide: NIX_*_COMPILE -> string
This commit is contained in:
parent
e5ded57aab
commit
981ae25113
@ -140,7 +140,7 @@ let
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
NIX_CFLAGS_COMPILE = toString ([
|
||||
# glibc 2.24 deprecated readdir_r so we need this
|
||||
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
|
||||
"-Wno-error=deprecated-declarations"
|
||||
@ -151,13 +151,13 @@ let
|
||||
"-fno-delete-null-pointer-checks"
|
||||
"-std=gnu++98"
|
||||
"-Wno-error"
|
||||
];
|
||||
]);
|
||||
|
||||
NIX_LDFLAGS= lib.optionals (!headless) [
|
||||
NIX_LDFLAGS= toString (lib.optionals (!headless) [
|
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
|
||||
];
|
||||
]);
|
||||
|
||||
buildFlags = [ "all" ];
|
||||
|
||||
|
@ -41,11 +41,11 @@ in stdenv.mkDerivation rec {
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
|
||||
stripDebugList = [ "bin" ];
|
||||
|
||||
NIX_LDFLAGS =
|
||||
NIX_LDFLAGS = toString (
|
||||
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
|
||||
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
|
||||
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
|
||||
++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib";
|
||||
++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib");
|
||||
|
||||
# Increase codegen units to introduce parallelism within the compiler.
|
||||
RUSTFLAGS = "-Ccodegen-units=10";
|
||||
|
@ -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;
|
||||
|
@ -88,10 +88,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# These are the defines that'd you'd get with --enable-debug=minimum (default).
|
||||
# See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-DG_ENABLE_DEBUG"
|
||||
"-DG_DISABLE_CAST_CHECKS"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
postPatch = ''
|
||||
files=(
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ automake autoconf libtool which ];
|
||||
|
||||
NIX_CFLAGS_LINK = [ "-pthread" ];
|
||||
NIX_CFLAGS_LINK = "-pthread";
|
||||
|
||||
patches = [
|
||||
./bootstrap.patch
|
||||
|
@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
|
||||
(if x11Support then "--enable-x11" else "--disable-x11")
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
|
||||
++ stdenv.lib.optionals x11Support [ libX11 libXext];
|
||||
++ stdenv.lib.optionals x11Support [ libX11 libXext ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = [ "-lX11" ];
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
|
||||
meta = {
|
||||
homepage = http://icculus.org/smpeg/;
|
||||
|
@ -29,7 +29,8 @@ if isPyPy then null else buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
# The tests use -Werror but with python3.6 clang detects some unreachable code.
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
|
||||
"-Wno-unused-command-line-argument -Wno-unreachable-code";
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
|
||||
checkPhase = ''
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";
|
||||
stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = false; # fails
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
|
||||
configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ];
|
||||
|
||||
NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
|
||||
NIX_LDFLAGS = "-ljack -L${libjack2}/lib";
|
||||
|
||||
instruments = fetchurl {
|
||||
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
|
||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
(lib.optional stdenv.isLinux "--with-randomdev=/dev/random")
|
||||
] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
"-Wno-error=pointer-compare"
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=stringop-truncation"
|
||||
|
Loading…
Reference in New Issue
Block a user