pyrox.dev / nixpkgs
lol
fork atom

treewide: more manual fixups for

treewide: move NIX_CFLAGS_COMPILE to the env attrset

`nix-eval-jobs --flake ".#legacyPackages.x86_64-linux" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'`
and
`nix-eval-jobs --flake ".#legacyPackages.aarch64-darwin" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'`

no longer has output so this could be all of the remaining issues

Artturin d06382a7 6600a103

+7 -12
unified split
+2 -2
pkgs/applications/misc/keepassxc/default.nix
··· 49 49 sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; 50 50 }; 51 51 52 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ 52 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ 53 53 "-Wno-old-style-cast" 54 54 "-Wno-error" 55 55 "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" 56 - ]; 56 + ]); 57 57 58 58 NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; 59 59
+2 -2
pkgs/development/interpreters/kerf/default.nix
··· 30 30 makeFlags = [ "kerf" "kerf_test" ]; 31 31 32 32 # avoid a huge amount of warnings to make failures clearer 33 - env.NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [ 33 + env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [ 34 34 "void-pointer-to-int-cast" 35 35 "format" 36 36 "implicit-function-declaration" 37 37 "gnu-variable-sized-type-not-at-end" 38 38 "unused-result" 39 - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; 39 + ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); 40 40 41 41 patchPhase = '' 42 42 substituteInPlace ./Makefile \
+1 -4
pkgs/development/libraries/liblastfm/default.nix
··· 23 23 buildInputs = [ fftwSinglePrec libsamplerate qtbase ] 24 24 ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; 25 25 26 - env.NIX_CFLAGS_COMPILE = 27 - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ 28 - "-std=c++11" 29 - ]; 26 + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; 30 27 31 28 dontWrapQtApps = true; 32 29
+1 -1
pkgs/development/ocaml-modules/lablgtk/default.nix
··· 12 12 rev = version; 13 13 sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; 14 14 }; 15 - env.NIX_CFLAGS_COMPILE = null; 15 + env = { }; 16 16 buildInputs = [ camlp-streams ]; 17 17 } else if check "3.12" then { 18 18 version = "2.18.5";
+1 -3
pkgs/development/python-modules/py3exiv2/default.nix
··· 26 26 ]; 27 27 28 28 # Work around Python distutils compiling C++ with $CC (see issue #26709) 29 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ 30 - "-I${lib.getDev libcxx}/include/c++/v1" 31 - ]; 29 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; 32 30 33 31 pythonImportsCheck = [ 34 32 "pyexiv2"