Merge pull request #30598 from andrewrk/zig

zig: init at 0.1.1
This commit is contained in:
Joachim F 2017-10-21 20:11:23 +00:00 committed by GitHub
commit b591b5cf5b
2 changed files with 36 additions and 1 deletions

@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }:
stdenv.mkDerivation rec {
version = "0.1.1";
name = "zig-${version}";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig";
rev = "${version}";
sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06";
};
buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ];
cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
"-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib"
"-DCMAKE_BUILD_TYPE=Release"
"-DZIG_EACH_LIB_RPATH=On"
];
preConfigure = ''
cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)"
'';
meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = http://ziglang.org/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
};
}

@ -7709,7 +7709,6 @@ with pkgs;
inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast;
};
### DEVELOPMENT / LIBRARIES
a52dec = callPackage ../development/libraries/a52dec { };
@ -11120,6 +11119,8 @@ with pkgs;
czmq = czmq3;
};
zig = callPackage ../development/compilers/zig {};
zimlib = callPackage ../development/libraries/zimlib { };
zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };