summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-02-23 18:01:49 +0000
committerGitHub <noreply@github.com>2023-02-23 18:01:49 +0000
commit3cdd7718204d55c46ee81a58706e2ef1d291cbe7 (patch)
treedbcce89d48dbf6ebcf08c550b3b3c1170e53c3a3 /pkgs/development/libraries/mesa
parent1dd9fc27f56c8cdc6315f701148ca40b6bff8087 (diff)
parent4688cd53b60d045633225e628d37f64105fb81ff (diff)
downloadnixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.gz
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.bz2
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.lz
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.xz
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.zst
nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 58079074eb1..40af4d88cc1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -323,10 +323,10 @@ self = stdenv.mkDerivation {
     done
   '';
 
-  NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [
     "-UPIPE_SEARCH_DIR"
     "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\""
-  ];
+  ]);
 
   passthru = {
     inherit (libglvnd) driverLink;