Skip to content

Commit

Permalink
zig_0_10: refactor
Browse files Browse the repository at this point in the history
- Use rec-less, overlay-style overridable recursive attributes (in effect since
#119942);
- Add decoration hooks over installCheckPhase
- Use doInstallCheck instead of doCheck.
- Directly sets env.ZIG_GLOBAL_CACHE_DIR instead of using preBuild
- Add meta.changelog
  • Loading branch information
AndersonTorres committed Jul 8, 2023
1 parent cc08d73 commit d485da9
Showing 1 changed file with 25 additions and 20 deletions.
45 changes: 25 additions & 20 deletions pkgs/development/compilers/zig/0.10.nix
Expand Up @@ -8,18 +8,19 @@
, zlib
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.10.1";
outputs = [ "out" "doc" ];

src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
};

outputs = [ "out" "doc" ];

nativeBuildInputs = [
cmake
llvmPackages.llvm.dev
Expand All @@ -41,14 +42,11 @@ stdenv.mkDerivation rec {
./zig_14559.patch
];

preBuild = ''
export HOME=$TMPDIR;
'';

# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
# Zig's build looks at /usr/bin/env to find dynamic linking info. This
# doesn't work in Nix' sandbox. Use env from our coreutils instead.
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env"
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace "/usr/bin/env" "${coreutils}/bin/env"
'';

cmakeFlags = [
Expand All @@ -62,27 +60,34 @@ stdenv.mkDerivation rec {
"-DZIG_TARGET_MCPU=baseline"
];

env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";

postBuild = ''
./zig2 build-exe ../doc/docgen.zig
./docgen ./zig2 ../doc/langref.html.in ./langref.html
'';

doCheck = true;

postInstall = ''
install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html
install -Dm644 -t $doc/share/doc/zig-${finalAttrs.version}/html ./langref.html
'';

doInstallCheck = true;

installCheckPhase = ''
$out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/cache-dir" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';

meta = with lib; {
meta = {
homepage = "https://ziglang.org/";
description =
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
license = licenses.mit;
maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ];
platforms = platforms.unix;
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres ];
platforms = lib.platforms.unix;
};
}
})

0 comments on commit d485da9

Please sign in to comment.