dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #280665 from magneticflux-/libedit

Browse Source 
{libedit,sharutils}: move env vars to `env.*`
This commit is contained in:
Weijia Wang 2024-01-17 15:23:24 +01:00 committed by GitHub
commit 97cef6e9b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libedit/default.nix
View File

@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
# There is a DR to fix this issue with Clang which is not merged
# yet.
# https://reviews.llvm.org/D137043
NIX_CFLAGS_COMPILE = lib.optional
(stdenv.targetPlatform.isMusl && stdenv.cc.isClang)
"-D__STDC_ISO_10646__=201103L";
env.NIX_CFLAGS_COMPILE =
lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang)
"-D__STDC_ISO_10646__=201103L";
patches = [ ./01-cygwin.patch ];

2
pkgs/tools/archivers/sharutils/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
'';
# Workaround to fix the static build on macOS.
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
doCheck = true;