diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-02-23 13:51:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-23 13:51:34 +0000 |
| commit | 52c286ee5b3b8f5c521b17411782311a313f2e4c (patch) | |
| tree | 948b519d8517d88cd81124703e5b4f35daf25019 /pkgs/development/libraries/mesa | |
| parent | 390b789c3950307a9dc6bb57d2f5f0ae69cfc76b (diff) | |
| parent | 129b6f78121802d18d215c9f9e04d7971c58ea0c (diff) | |
| download | nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.gz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.bz2 nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.lz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.xz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.zst nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/libraries/pmdk/default.nix
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 25b23577597..480c2d8c858 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; |