Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion doc/languages-frameworks/emscripten.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ See the `zlib` example:
(old: rec {
buildInputs = old.buildInputs ++ [ pkg-config ];
# we need to reset this setting!
NIX_CFLAGS_COMPILE="";
env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; };
configurePhase = ''
# FIXME: Some tests require writing at $HOME
HOME=$TMPDIR
Expand Down
2 changes: 1 addition & 1 deletion doc/stdenv/stdenv.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':

Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around.

Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`.
Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `env.NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`.

This needs to be turned off or fixed for errors similar to:

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aacgain/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libtool
];

NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";

meta = with lib; {
description = "ReplayGain for AAC files";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/adlplug/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
"-DADLplug_Jack=${if withJack then "ON" else "OFF"}"
];

NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
# "fp.h" file not found
"-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"
]);
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aether-lv2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
lv2 libX11 libGL libGLU mesa
];

NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=array-bounds"
"-Wno-error=stringop-overflow"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/audio-recorder/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};

# https://bugs.launchpad.net/audio-recorder/+bug/1784622
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bespokesynth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
CoreAudioKit
];

NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
# Fails to find fp.h on its own
"-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"
]);
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bristol/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of
# `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

preInstall = ''
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/fire/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
'';

# Fails to find fp.h on its own
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/";

doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/freewheeling/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
];
NIX_CFLAGS_COMPILE = toString
env.NIX_CFLAGS_COMPILE = toString
(makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]);

hardeningDisable = [ "format" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/furnace/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ stdenv.mkDerivation rec {
"-DWARNINGS_ARE_ERRORS=ON"
];

NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
# Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc)
"-Wno-error=mismatched-new-delete"
"-Wno-error=use-after-free"
];
]);

postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/giada/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
"-w"
"-Wno-error"
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/gnaural/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# Workaround build failure on -fno-common toolchains:
# ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint';
# src/net/../../src/gnauralnet.h:233: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

postInstall = ''
mkdir -p $out/share/applications
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/grandorgue/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
"-DINSTALL_DEPEND=OFF"
] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF";

NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0";

postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin,lib}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/gtkpod/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of
# `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

enableParallelBuilding = true;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/guitarix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
"--install-roboto-font"
] ++ optional optimizationSupport "--optimization";

NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];

meta = with lib; {
description = "A virtual guitar amplifier for Linux running with JACK";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/jamin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of
# `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/klystrack/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of
# `menu_t'; objs.release/action.o:(.bss+0x20): first defined here
# TODO: remove it for 1.7.7+ release as it was fixed upstream.
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/littlegptracker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ]
++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ];

NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++
lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++
lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing");

NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation";

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/lsp-plugins/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"PREFIX=${placeholder "out"}"
];

NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";
env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";

configurePhase = ''
make config PREFIX=${placeholder "out"}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mi2ly/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

hardeningDisable = [ "format" ];

NIX_CFLAGS_COMPILE = [ "-fgnu89-inline" ];
env.NIX_CFLAGS_COMPILE = toString [ "-fgnu89-inline" ];

buildPhase = "./cc";
installPhase = ''
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mimic/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
pcre2
] ++ lib.optional pulseaudioSupport libpulseaudio;

NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=free-nonheap-object"
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mp3blaster/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
libvorbis
] ++ lib.optional stdenv.isDarwin SDL;

NIX_CFLAGS_COMPILE = toString ([
env.NIX_CFLAGS_COMPILE = toString ([
"-Wno-narrowing"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-reserved-user-defined-literal"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mpc123/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

buildInputs = [ gettext libmpcdec libao ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mpg321/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of
# `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

configureFlags =
[ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/muse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord
];

NIX_CFLAGS_COMPILE = [ "-I${lib.getDev serd}/include/serd-0" ];
env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev serd}/include/serd-0" ];

meta = with lib; {
homepage = "https://muse-sequencer.github.io/";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/oxefmsynth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
};

NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ];

buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/picoloop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ];

NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ];
env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" ];

hardeningDisable = [ "format" ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/pragha/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ mkDerivation rec {

CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ];

NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0";
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0";

postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/sayonara/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ mkDerivation rec {
];

# gstreamer cannot otherwise be found
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";

postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/soundscape-renderer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation {
# Without it doesn't find all of the boost libraries.
BOOST_LIB_DIR = "${boost}/lib";
# uses the deprecated get_generic_category() in boost_system
NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";

LC_ALL = "en_US.UTF-8";

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/tenacity/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';

NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\"";
env.NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\"";

# tenacity only looks for ffmpeg at runtime, so we need to link it in manually
NIX_LDFLAGS = toString [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/transcode/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of
# `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

meta = with lib; {
description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/ympd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd';
# CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here
# Should be fixed by pending https://github.com/notandy/ympd/pull/191 (does not apply as is).
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libmpdclient openssl ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ stdenv.mkDerivation rec {

# Force optimization to fix:
# warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O)
NIX_CFLAGS_COMPILE = "-O3";
env.NIX_CFLAGS_COMPILE = "-O3";

# Remove pre-built y.tab.c to generate with nixpkgs bison
preBuild = ''
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/blockchains/cgminer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
# ld: cgminer-driver-modminer.o:/build/source/miner.h:285:
# multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285:
# first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";

meta = with lib; {
description = "CPU/GPU miner in c for bitcoin";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/display-managers/greetd/gtkgreet.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
];

# G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+.
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

meta = with lib; {
description = "GTK based greeter for greetd, to be run under cage or similar";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ let

irony = super.irony.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
preConfigure = ''
cd server
'';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/gnome-latex/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

passthru.updateScript = gnome.updateScript {
packageName = pname;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/hexcurse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
};
buildInputs = [ ncurses ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ];
patches = [
# gcc7 compat
(fetchpatch {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/ht/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

patches = [ ./gcc7.patch ];

NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ];

meta = with lib; {
description = "File editor/viewer/analyzer for executables";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/nedit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# the linux config works fine on darwin too!
buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux";

NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";
env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib";

installPhase = ''
mkdir -p $out/bin
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/texmaker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mkDerivation rec {

buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
nativeBuildInputs = [ pkg-config poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";

qmakeFlags = [
"DESKTOPDIR=${placeholder "out"}/share/applications"
Expand Down
Loading