nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cc-wrapper: add zig

Browse Source
This commit is contained in:
Tristan Ross 2024-06-07 07:57:29 -07:00
parent 65c81d4eae
commit e9fb54b256
No known key found for this signature in database
GPG Key ID: B09C422035669AF8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/cc-wrapper/default.nix
View File

@ -15,7 +15,8 @@
, propagateDoc ? cc != null && cc ? man , propagateDoc ? cc != null && cc ? man
, extraTools ? [], extraPackages ? [], extraBuildCommands ? "" , extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
, nixSupport ? {} , nixSupport ? {}
, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null , isGNU ? false, isClang ? cc.isClang or false, isZig ? cc.isZig or false, isCcache ? cc.isCcache or false
, gnugrep ? null
, expand-response-params , expand-response-params
, libcxx ? null , libcxx ? null
@ -311,7 +312,7 @@ stdenvNoCC.mkDerivation {
# Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
# unused middle-ground name that evokes both. # unused middle-ground name that evokes both.
inherit bintools; inherit bintools;
inherit cc libc libcxx nativeTools nativeLibc nativePrefix isGNU isClang; inherit cc libc libcxx nativeTools nativeLibc nativePrefix isGNU isClang isZig;
emacsBufferSetup = pkgs: '' emacsBufferSetup = pkgs: ''
; We should handle propagation here too ; We should handle propagation here too

1
pkgs/top-level/all-packages.nix
View File

@ -16662,6 +16662,7 @@ with pkgs;
isGNU = cc.isGNU or false; isGNU = cc.isGNU or false;
isClang = cc.isClang or false; isClang = cc.isClang or false;
isZig = cc.isZig or false;
inherit cc bintools libc libcxx extraPackages nixSupport zlib; inherit cc bintools libc libcxx extraPackages nixSupport zlib;
} // extraArgs; in self); } // extraArgs; in self);