From cfd20fa9e11333a6a8372adaae0f26f35f441f90 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 13 May 2021 23:33:53 -0300 Subject: [PATCH] zig: rewrite substituteAll is not used anymore. --- pkgs/development/compilers/zig/default.nix | 30 ++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index bd96010e8bfb..41e63d63dbeb 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, libxml2 +, zlib +}: llvmPackages.stdenv.mkDerivation rec { - version = "0.7.1"; pname = "zig"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md"; + hash = "sha256-rZYv8LFH3M70SyPwPVyul+Um9j82K8GZIepVmaonzPw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; buildInputs = [ - llvmPackages.clang-unwrapped - llvmPackages.llvm - llvmPackages.lld libxml2 zlib - ]; + ] ++ (with llvmPackages; [ + clang-unwrapped + lld + llvm + ]); preBuild = '' export HOME=$TMPDIR; @@ -33,12 +43,12 @@ llvmPackages.stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + homepage = "https://ziglang.org/"; description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - homepage = "https://ziglang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewrk AndersonTorres ]; platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; # See https://github.com/NixOS/nixpkgs/issues/86299 broken = stdenv.isDarwin; };