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

zig: 0.1.1 -> 0.2.0

Browse Source
This commit is contained in:
Andrew Kelley 2018-03-18 20:13:46 -04:00
parent 805721bdda
commit dc3b791854
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/zig/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages }: { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.1"; version = "0.2.0";
name = "zig-${version}"; name = "zig-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zig-lang"; owner = "zig-lang";
repo = "zig"; repo = "zig";
rev = "${version}"; rev = "${version}";
sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07";
}; };
buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ];
cmakeFlags = [ cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity"; description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = http://ziglang.org/; homepage = https://ziglang.org/;
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ]; maintainers = [ maintainers.andrewrk ];

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

@ -11851,7 +11851,9 @@ with pkgs;
czmq = czmq3; czmq = czmq3;
}; };
zig = callPackage ../development/compilers/zig {}; zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_6;
};
zimlib = callPackage ../development/libraries/zimlib { }; zimlib = callPackage ../development/libraries/zimlib { };