ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 11:00:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-23 18:01:49 +00:00 committed by GitHub
commit 3cdd771820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
803 changed files with 1091 additions and 1013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/emscripten.section.md
View File

@ -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

2
doc/stdenv/stdenv.chapter.md
View File

@ -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:

10
lib/licenses.nix
View File

@ -109,6 +109,11 @@ in mkLicense lset) ({
fullName = "Apache License 2.0";
};
asl20-llvm = {
spdxId = "Apache-2.0 WITH LLVM-exception";
fullName = "Apache License 2.0 with LLVM Exceptions";
};
bitstreamVera = {
spdxId = "Bitstream-Vera";
fullName = "Bitstream Vera Font License";
@ -657,11 +662,6 @@ in mkLicense lset) ({
url = "https://opensource.franz.com/preamble.html";
};
llvm-exception = {
spdxId = "LLVM-exception";
fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
};
lppl12 = {
spdxId = "LPPL-1.2";
fullName = "LaTeX Project Public License v1.2";

16
nixos/modules/hardware/keyboard/qmk.nix Normal file
View File

@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
let
cfg = config.hardware.keyboard.qmk;
inherit (lib) mdDoc mkEnableOption mkIf;
in
{
options.hardware.keyboard.qmk = {
enable = mkEnableOption (mdDoc "non-root access to the firmware of QMK keyboards");
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.qmk-udev-rules ];
};
}

6
nixos/modules/hardware/keyboard/teck.nix
View File

@ -1,16 +1,16 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.hardware.keyboard.teck;
inherit (lib) mdDoc mkEnableOption mkIf;
in
{
options.hardware.keyboard.teck = {
enable = mkEnableOption (lib.mdDoc "non-root access to the firmware of TECK keyboards");
enable = mkEnableOption (mdDoc "non-root access to the firmware of TECK keyboards");
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.teck-udev-rules ];
};
}

7
nixos/modules/hardware/keyboard/uhk.nix
View File

@ -1,13 +1,14 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.hardware.keyboard.uhk;
inherit (lib) mdDoc mkEnableOption mkIf;
in
{
options.hardware.keyboard.uhk = {
enable = mkEnableOption (lib.mdDoc ''
non-root access to the firmware of UHK keyboards.
enable = mkEnableOption (mdDoc ''
non-root access to the firmware of UHK keyboards.
You need it when you want to flash a new firmware on the keyboard.
Access to the keyboard is granted to users in the "input" group.
You may want to install the uhk-agent package.

19
nixos/modules/hardware/keyboard/zsa.nix
View File

@ -1,21 +1,18 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkOption mkIf types;
cfg = config.hardware.keyboard.zsa;
inherit (lib) mkEnableOption mkIf mdDoc;
in
{
options.hardware.keyboard.zsa = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
You need it when you want to flash a new configuration on the keyboard
or use their live training in the browser.
You may want to install the wally-cli package.
'';
};
enable = mkEnableOption (mdDoc ''
udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
You need it when you want to flash a new configuration on the keyboard
or use their live training in the browser.
You may want to install the wally-cli package.
'');
};
config = mkIf cfg.enable {

1
nixos/modules/module-list.nix
View File

@ -59,6 +59,7 @@
./hardware/gpgsmartcards.nix
./hardware/hackrf.nix
./hardware/i2c.nix
./hardware/keyboard/qmk.nix
./hardware/keyboard/teck.nix
./hardware/keyboard/uhk.nix
./hardware/keyboard/zsa.nix

2
nixos/modules/services/networking/unbound.nix
View File

@ -286,6 +286,8 @@ in {
LockPersonality = true;
RestrictSUIDSGID = true;
ReadWritePaths = [ cfg.stateDir ];
Restart = "on-failure";
RestartSec = "5s";
};

2
pkgs/applications/audio/aacgain/default.nix
View File

@ -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";

2
pkgs/applications/audio/adlplug/default.nix
View File

@ -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"
]);

2
pkgs/applications/audio/aether-lv2/default.nix
View File

@ -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"

2
pkgs/applications/audio/audio-recorder/default.nix
View File

@ -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 ];

2
pkgs/applications/audio/bespokesynth/default.nix
View File

@ -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/"
]);

2
pkgs/applications/audio/bristol/default.nix
View File

@ -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

2
pkgs/applications/audio/fire/default.nix
View File

@ -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;

2
pkgs/applications/audio/freewheeling/default.nix
View File

@ -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" ];

4
pkgs/applications/audio/furnace/default.nix
View File

@ -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

2
pkgs/applications/audio/giada/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
"-w"
"-Wno-error"
];

2
pkgs/applications/audio/gnaural/default.nix
View File

@ -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

2
pkgs/applications/audio/grandorgue/default.nix
View File

@ -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}

2
pkgs/applications/audio/gtkpod/default.nix
View File

@ -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;

2
pkgs/applications/audio/guitarix/default.nix
View File

@ -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";

2
pkgs/applications/audio/jamin/default.nix
View File

@ -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

2
pkgs/applications/audio/klystrack/default.nix
View File

@ -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" ];

4
pkgs/applications/audio/littlegptracker/default.nix
View File

@ -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";

2
pkgs/applications/audio/lsp-plugins/default.nix
View File

@ -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"}

2
pkgs/applications/audio/mi2ly/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = [ "-fgnu89-inline" ];
env.NIX_CFLAGS_COMPILE = toString [ "-fgnu89-inline" ];
buildPhase = "./cc";
installPhase = ''

2
pkgs/applications/audio/mimic/default.nix
View File

@ -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"
];

2
pkgs/applications/audio/mp3blaster/default.nix
View File

@ -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"

2
pkgs/applications/audio/mpc123/default.nix
View File

@ -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 ];

2
pkgs/applications/audio/mpg321/default.nix
View File

@ -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")) ]

2
pkgs/applications/audio/muse/default.nix
View File

@ -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/";

2
pkgs/applications/audio/oxefmsynth/default.nix
View File

@ -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" ];

2
pkgs/applications/audio/picoloop/default.nix
View File

@ -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" ];

2
pkgs/applications/audio/pragha/default.nix
View File

@ -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")

2
pkgs/applications/audio/sayonara/default.nix
View File

@ -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")

2
pkgs/applications/audio/soundscape-renderer/default.nix
View File

@ -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";

2
pkgs/applications/audio/tenacity/default.nix
View File

@ -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 [

2
pkgs/applications/audio/transcode/default.nix
View File

@ -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";

2
pkgs/applications/audio/ympd/default.nix
View File

@ -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 ];

2
pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
View File

@ -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 = ''

2
pkgs/applications/blockchains/cgminer/default.nix
View File

@ -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";

2
pkgs/applications/display-managers/greetd/gtkgreet.nix
View File

@ -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";

2
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -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
'';

2
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -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;

2
pkgs/applications/editors/hexcurse/default.nix
View File

@ -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 {

2
pkgs/applications/editors/ht/default.nix
View File

@ -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";

2
pkgs/applications/editors/nedit/default.nix
View File

@ -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

2
pkgs/applications/editors/texmaker/default.nix
View File

@ -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"

9
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -1348,6 +1348,15 @@ self: super: {
dependencies = with self; [ vimproc-vim ];
});
vim-trailing-whitespace = super.vim-trailing-whitespace.overrideAttrs (old: {
patches = [(fetchpatch {
# https://github.com/bronson/vim-trailing-whitespace/pull/30
name = "fix-add-dynamic-TerminalOpen-for-both-vim-and-nvim.patch";
url = "https://github.com/bronson/vim-trailing-whitespace/commit/99ef803ebdc01d62b418a3e9386d5f10797bfac3.patch";
hash = "sha256-cyanHUKxhbY8c6EkAbpUq7QcEBQABCwZ6NoEUOpd2F8=";
})];
});
vim-zettel = super.vim-zettel.overrideAttrs (old: {
dependencies = with self; [ vimwiki fzf-vim ];
});

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2597,8 +2597,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "2.16.0";
sha256 = "sha256-Qr4cYAEvAkvvE6KytVeInJzcMQJZqr/e/KPfelVzjUA=";
version = "2.17.1";
sha256 = "sha256-gQSAq63fqniHmA9T0nKpUAzo+kpSCZzblr6FQ33LIPI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

2
pkgs/applications/emulators/bsnes/ares/default.nix
View File

@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
"-C desktop-ui"
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14";
meta = with lib; {
homepage = "https://ares-emu.net";

2
pkgs/applications/emulators/dosbox-staging/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
speexdsp
];
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
"-I${SDL2_image}/include/SDL2"
"-I${SDL2_net}/include/SDL2"
];

2
pkgs/applications/emulators/gens-gs/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Work around build failures on recent GTK.
# See http://ubuntuforums.org/showthread.php?p=10535837
NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
env.NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
meta = with lib; {
homepage = "https://segaretro.org/Gens/GS";

2
pkgs/applications/emulators/mame/default.nix
View File

@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
--subst-var-by mamePath "$out/opt/mame"
'';
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=use-after-free"
];

2
pkgs/applications/emulators/np2kai/default.nix
View File

@ -157,7 +157,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# TODO Remove when bumping past rev22
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
buildPhase = optionalString enableSDL ''
cd sdl2

2
pkgs/applications/emulators/pcsxr/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile';
# LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
dynarecTarget =
if stdenv.isx86_64 then "x86_64"

2
pkgs/applications/emulators/simh/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# Workaround to build against upstream gcc-10 and clang-11.
# Can be removed when next release contains
# https://github.com/simh/simh/issues/794
NIX_CFLAGS_COMPILE = [ "-fcommon" ];
env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ];
makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];

2
pkgs/applications/emulators/tilem/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
env.NIX_CFLAGS_COMPILE = toString [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";
description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";

2
pkgs/applications/emulators/uae/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# Workaround build failure on -fno-common toolchains:
# ld: bsdsocket.o:(.bss+0x0): multiple definition of
# `socketbases'; main.o:(.bss+0x2792c0): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
LDFLAGS = [ "-lm" ];
meta = {

2
pkgs/applications/emulators/zsnes/2.x.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
dontConfigure = true;
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
# Until upstream fixes the issues...
"-Wp,-D_FORTIFY_SOURCE=0"
];

2
pkgs/applications/emulators/zsnes/default.nix
View File

@ -35,7 +35,7 @@ in stdenv.mkDerivation {
# Workaround build failure on -fno-common toolchains:
# ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here
# Use pre-c++17 standard (c++17 forbids throw annotations)
NIX_CFLAGS_COMPILE = "-fcommon -std=c++14";
env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14";
preConfigure = ''
cd src

2
pkgs/applications/file-managers/nnn/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
makeFlags = [ "PREFIX=$(out)" ]

2
pkgs/applications/file-managers/spacefm/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here
# TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772
# or equivalent is merged upstream.
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash"

2
pkgs/applications/graphics/foxotron/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ];
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=array-bounds"
];

2
pkgs/applications/graphics/freepv/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
--replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8
'';
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing";
env.NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing";
meta = {
description = "Open source panorama viewer using GL";

2
pkgs/applications/graphics/gimp/default.nix
View File

@ -154,7 +154,7 @@ in stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";
# Check if librsvg was built with --disable-pixbuf-loader.
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";

2
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -236,7 +236,7 @@ in
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lm";
src = fetchurl {
url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";

2
pkgs/applications/graphics/gnuclad/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};
NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=catch-value";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=catch-value";
nativeBuildInputs = [ pkg-config ];

2
pkgs/applications/graphics/goxel/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
buildInputs = [ glfw3 gtk3 libpng12 ];
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=format-truncation"
];

2
pkgs/applications/graphics/gqview/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lm";
meta = with lib; {

2
pkgs/applications/graphics/grafx2/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# gcc-10. Otherwise build fails as:
# ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of
# `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
preInstall = '' mkdir -p "$out" '';

2
pkgs/applications/graphics/hugin/default.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
# disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = ''
for p in $out/bin/*; do

2
pkgs/applications/graphics/imgcat/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M=";
};
NIX_CFLAGS_COMPILE = "-Wno-error";
env.NIX_CFLAGS_COMPILE = "-Wno-error";
meta = with lib; {
description = "It's like cat, but for images";

2
pkgs/applications/graphics/jpeg-archive/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation {
# gcc-10. Otherwise build fails as:
# ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here
# https://github.com/danielgtaylor/jpeg-archive/issues/119
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"

4
pkgs/applications/graphics/krita/generic.nix
View File

@ -33,8 +33,8 @@ mkDerivation rec {
xsimd
];
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ]
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy");
# Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script.
# Patch the PYTHONPATH so python scripts can import sip successfully.

2
pkgs/applications/graphics/luminance-hdr/default.nix
View File

@ -15,7 +15,7 @@ mkDerivation rec {
sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn";
};
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
buildInputs = [
qtbase qtdeclarative qttools qtwebengine eigen

2
pkgs/applications/graphics/photoflare/default.nix
View File

@ -17,7 +17,7 @@ mkDerivation rec {
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";
env.NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";
meta = with lib; {
description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface";

2
pkgs/applications/kde/print-manager.nix
View File

@ -22,5 +22,5 @@ mkDerivation {
outputs = [ "out" "dev" ];
# Fix build with cups deprecations etc.
# See: https://github.com/NixOS/nixpkgs/issues/73334
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
}

2
pkgs/applications/misc/apvlv/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i";
};
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
nativeBuildInputs = [
cmake

2
pkgs/applications/misc/bb/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
# error: 'regparm' is not valid on this platform
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
"-D__STRICT_ANSI__";
meta = with lib; {

2
pkgs/applications/misc/blender/default.nix
View File

@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
"-DOPTIX_ROOT_DIR=${optix}"
];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
# Since some dependencies are built with gcc 6, we need gcc 6's
# libstdc++ in our RPATH. Sigh.

2
pkgs/applications/misc/cataract/build.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
# avoid build failures like:
# ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of
# `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
mkdir $out/{bin,share} -p

2
pkgs/applications/misc/getxbook/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
NIX_CFLAGS_COMPILE = builtins.toString (
env.NIX_CFLAGS_COMPILE = builtins.toString (
[ "-Wno-error=deprecated-declarations" ]
++ lib.optionals (!stdenv.cc.isClang) [
"-Wno-error=format-truncation"

2
pkgs/applications/misc/gmtp/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
# ld: gmtp-preferences.o:src/main.h:72: multiple definition of
# `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here
# TODO: can be removed when 1.4.0 is released.
NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = "-fcommon";
preFixup = ''
gappsWrapperArgs+=(--add-flags "--datapath $out/share");

2
pkgs/applications/misc/gpsbabel/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
# Floating point behavior on i686 causes nmea.test failures. Preventing
# extended precision fixes this problem.
NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store";
doCheck = true;

2
pkgs/applications/misc/gxneur/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [

2
pkgs/applications/misc/keepassxc/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
"-Wno-old-style-cast"
"-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"

2
pkgs/applications/misc/klayout/default.nix
View File

@ -45,7 +45,7 @@ mkDerivation rec {
mv $out/lib/klayout $out/bin/
'';
NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ];
dontInstall = true; # Installation already happens as part of "build.sh"

2
pkgs/applications/misc/lsd2dsl/default.nix
View File

@ -17,7 +17,7 @@ mkDerivation rec {
buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";
desktopItems = lib.singleton (makeDesktopItem {
name = "lsd2dsl";

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
patchShebangs tools/get_wb_version.sh
'';
NIX_CFLAGS_COMPILE = [
env.NIX_CFLAGS_COMPILE = toString ([
# error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
"-Wno-error=deprecated-declarations"
] ++ lib.optionals stdenv.isAarch64 [
@ -149,7 +149,7 @@ in stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
# Needed with GCC 12 but problematic with some old GCCs
"-Wno-error=maybe-uninitalized"
];
]);
cmakeFlags = [
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"

2
pkgs/applications/misc/nut/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
meta = with lib; {
description = "Network UPS Tools";

4
pkgs/applications/misc/opencpn/default.nix
View File

@ -117,9 +117,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [
"-DSQUISH_USE_SSE=0"
];
]);
postInstall = lib.optionals stdenv.isDarwin ''
mkdir -p $out/Applications

2
pkgs/applications/misc/opentrack/aruco.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ opencv4 ];
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
preInstall = ''
mkdir -p $out/include/aruco

2
pkgs/applications/misc/opentrack/default.nix
View File

@ -42,7 +42,7 @@ in
nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];
buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco];
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
dontWrapQtApps = true;
cmakeFlags = [

2
pkgs/applications/misc/osm2xmap/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ];

2
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
# Disable compiler warnings that clutter the build log.
# It seems to be a known issue for Eigen:
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
env.NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
# prusa-slicer uses dlopen on `libudev.so` at runtime
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";

2
pkgs/applications/misc/pw-viz/default.nix
View File

@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
# enables pipewire API deprecated in 0.3.64
# fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ];
env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
meta = with lib; {
description = "A simple and elegant pipewire graph editor ";

2
pkgs/applications/misc/qlcplus/default.nix
View File

@ -29,7 +29,7 @@ mkDerivation rec {
qmakeFlags = [ "INSTALLROOT=$(out)" ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
postPatch = ''
patchShebangs .

Some files were not shown because too many files have changed in this diff Show More