alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #181432 from aiotter/patch-2

Browse source 
zig: build on darwin
This commit is contained in:
Anderson Torres 2022-07-16 11:02:48 -03:00 committed by GitHub
parent d5502e787e 036b52f824
commit 3bb0ae1512
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -417,6 +417,12 @@
githubId = 4732885; githubId = 4732885;
name = "Ivan Jager"; name = "Ivan Jager";
}; };
aiotter = {
email = "git@aiotter.com";
github = "aiotter";
githubId = 37664775;
name = "Yuto Oguchi";
};
airwoodix = { airwoodix = {
email = "airwoodix@posteo.me"; email = "airwoodix@posteo.me";
github = "airwoodix"; github = "airwoodix";

7
pkgs/development/compilers/zig/default.nix
View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, llvmPackages , llvmPackages
@ -6,9 +7,6 @@
, zlib , zlib
}: }:
let
inherit (llvmPackages) stdenv;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zig"; pname = "zig";
version = "0.9.1"; version = "0.9.1";
@ -50,8 +48,7 @@ stdenv.mkDerivation rec {
description = description =
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ andrewrk AndersonTorres ]; maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299
}; };
} }

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

@ -21686,6 +21686,7 @@ with pkgs;
libzra = callPackage ../development/libraries/libzra { }; libzra = callPackage ../development/libraries/libzra { };
zig = callPackage ../development/compilers/zig { zig = callPackage ../development/compilers/zig {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
llvmPackages = llvmPackages_13; llvmPackages = llvmPackages_13;
}; };