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/glib | |
| parent | 390b789c3950307a9dc6bb57d2f5f0ae69cfc76b (diff) | |
| parent | 129b6f78121802d18d215c9f9e04d7971c58ea0c (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/libraries/pmdk/default.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 489b3154f0d72..cf14aa610756c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dxattr=false" ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=nonnull" # Default for release buildtype but passed manually because # we're using plain |