nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

{libedit,sharutils}: move env vars to env.*

Browse Source 
Closes https://github.com/NixOS/nixpkgs/issues/273746
See https://github.com/NixOS/nixpkgs/pull/217206

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
This commit is contained in:
Mitchell Skaggs 2024-01-12 22:59:33 -06:00
parent fcb7c27c72
commit d0f90d9ca7
No known key found for this signature in database
GPG Key ID: 4EB0FECB84AE8967
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 # There is a DR to fix this issue with Clang which is not merged
# yet. # yet.
# https://reviews.llvm.org/D137043 # https://reviews.llvm.org/D137043
NIX_CFLAGS_COMPILE = lib.optional env.NIX_CFLAGS_COMPILE =
(stdenv.targetPlatform.isMusl && stdenv.cc.isClang) lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang)
"-D__STDC_ISO_10646__=201103L"; "-D__STDC_ISO_10646__=201103L";
patches = [ ./01-cygwin.patch ]; 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. # 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; doCheck = true;