public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: NIX_*_COMPILE -> string

Browse Source
This commit is contained in:
Robin Gloster 2019-10-30 01:12:09 +01:00 committed by Jan Tojnar
parent e5ded57aab
commit 981ae25113
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
11 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/openjdk/8.nix
View File

@ -140,7 +140,7 @@ let
separateDebugInfo = true; separateDebugInfo = true;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = toString ([
# glibc 2.24 deprecated readdir_r so we need this # glibc 2.24 deprecated readdir_r so we need this
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
"-Wno-error=deprecated-declarations" "-Wno-error=deprecated-declarations"
@ -151,13 +151,13 @@ let
"-fno-delete-null-pointer-checks" "-fno-delete-null-pointer-checks"
"-std=gnu++98" "-std=gnu++98"
"-Wno-error" "-Wno-error"
]; ]);
NIX_LDFLAGS= lib.optionals (!headless) [ NIX_LDFLAGS= toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
]; ]);
buildFlags = [ "all" ]; buildFlags = [ "all" ];

4
pkgs/development/compilers/rust/rustc.nix
View File

@ -41,11 +41,11 @@ in stdenv.mkDerivation rec {
# See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
stripDebugList = [ "bin" ]; stripDebugList = [ "bin" ];
NIX_LDFLAGS = NIX_LDFLAGS = toString (
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" ++ 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. # Increase codegen units to introduce parallelism within the compiler.
RUSTFLAGS = "-Ccodegen-units=10"; RUSTFLAGS = "-Ccodegen-units=10";

2
pkgs/development/interpreters/love/0.10.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
"--with-lua=luajit" "--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 = { meta = {
homepage = http://love2d.org; homepage = http://love2d.org;

5
pkgs/development/libraries/gtk/3.x.nix
View File

@ -88,10 +88,7 @@ stdenv.mkDerivation rec {
# These are the defines that'd you'd get with --enable-debug=minimum (default). # 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 # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
"-DG_ENABLE_DEBUG"
"-DG_DISABLE_CAST_CHECKS"
];
postPatch = '' postPatch = ''
files=( files=(

2
pkgs/development/libraries/ilmbase/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ automake autoconf libtool which ]; nativeBuildInputs = [ automake autoconf libtool which ];
NIX_CFLAGS_LINK = [ "-pthread" ]; NIX_CFLAGS_LINK = "-pthread";
patches = [ patches = [
./bootstrap.patch ./bootstrap.patch

2
pkgs/development/libraries/libcaca/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
(if x11Support then "--enable-x11" else "--disable-x11") (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; enableParallelBuilding = true;

2
pkgs/development/libraries/smpeg/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
--prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
''; '';
NIX_LDFLAGS = [ "-lX11" ]; NIX_LDFLAGS = "-lX11";
meta = { meta = {
homepage = http://icculus.org/smpeg/; homepage = http://icculus.org/smpeg/;

3
pkgs/development/python-modules/cffi/default.nix
View File

@ -29,7 +29,8 @@ if isPyPy then null else buildPythonPackage rec {
''; '';
# The tests use -Werror but with python3.6 clang detects some unreachable code. # 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 doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
checkPhase = '' checkPhase = ''

2
pkgs/development/tools/documentation/doxygen/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
NIX_CFLAGS_COMPILE = 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; enableParallelBuilding = true;
doCheck = false; # fails doCheck = false; # fails

2
pkgs/tools/misc/timidity/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; 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 { instruments = fetchurl {
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;

2
pkgs/tools/networking/dhcp/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
(lib.optional stdenv.isLinux "--with-randomdev=/dev/random") (lib.optional stdenv.isLinux "--with-randomdev=/dev/random")
] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = builtins.toString [
"-Wno-error=pointer-compare" "-Wno-error=pointer-compare"
"-Wno-error=format-truncation" "-Wno-error=format-truncation"
"-Wno-error=stringop-truncation" "-Wno-error=stringop-truncation"