ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37352 from andrewrk/zig-0.2.0

Browse Source 
zig: 0.1.1 -> 0.2.0
This commit is contained in:
Will Dietz 2018-03-20 12:43:27 -05:00 committed by GitHub
commit d5797472e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
version = "0.1.1";
version = "0.2.0";
name = "zig-${version}";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig";
rev = "${version}";
sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06";
sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07";
};
buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ];
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ];
cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = http://ziglang.org/;
homepage = https://ziglang.org/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];

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

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