diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-10-21 20:11:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 20:11:23 +0000 |
| commit | b591b5cf5b4c1684404bfacb04b8449eb651c378 (patch) | |
| tree | fb1e790dd97838eea89222aa0ff691bc252ea5b8 /pkgs | |
| parent | a0221824fbaa2af305680fc12a630c1a78d99071 (diff) | |
| parent | 835201e8141f16167ef02ca62335e65d7042a673 (diff) | |
| download | nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar.gz nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar.bz2 nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar.lz nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar.xz nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.tar.zst nixpkgs-b591b5cf5b4c1684404bfacb04b8449eb651c378.zip | |
Merge pull request #30598 from andrewrk/zig
zig: init at 0.1.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix new file mode 100644 index 00000000000..6f0c6d19e45 --- /dev/null +++ b/pkgs/development/compilers/zig/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5174e360bf..1ff3da0c13e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |