diff options
| author | Artturin <Artturin@artturin.com> | 2023-02-19 21:23:07 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-02-22 21:23:04 +0200 |
| commit | 6f6cc4a22db345c66bcb69c26469b0140ca3be44 (patch) | |
| tree | e851a90035e6371da52a64732344873f43de0195 /pkgs/applications/graphics | |
| parent | 425e4250dbaab761b638542119b9c5cc604f1d86 (diff) | |
| download | nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar.gz nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar.bz2 nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar.lz nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar.xz nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.tar.zst nixpkgs-6f6cc4a22db345c66bcb69c26469b0140ca3be44.zip | |
treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported which will be a issue with some patches and some wrappers like cc-wrapper
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/foxotron/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/goxel/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index ca2aa96bea1..9990cd328c8 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -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 = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=array-bounds" ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8f70d9273b7..90203a9d47e 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=format-truncation" ]; diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 86d8de46f99..95245b29ae7 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -33,7 +33,7 @@ mkDerivation rec { xsimd ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] + 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. |