lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #305395 from ExpidusOS/feat/update-zig-0.12

zig_0_12: init

authored by

Weijia Wang and committed by
GitHub
2af28fdb b03c3729

+45 -1
+37
pkgs/development/compilers/zig/0.12.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , llvmPackages 6 + , libxml2 7 + , zlib 8 + , coreutils 9 + , callPackage 10 + }@args: 11 + 12 + import ./generic.nix args { 13 + version = "0.12.0"; 14 + 15 + hash = "sha256-RNZiUZtaKXoab5kFrDij6YCAospeVvlLWheTc3FGMks="; 16 + 17 + outputs = [ "out" "doc" ]; 18 + 19 + cmakeFlags = [ 20 + # file RPATH_CHANGE could not write new RPATH 21 + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) 22 + 23 + # always link against static build of LLVM 24 + (lib.cmakeBool "ZIG_STATIC_LLVM" true) 25 + 26 + # ensure determinism in the compiler build 27 + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") 28 + ]; 29 + 30 + postBuild = '' 31 + stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig 32 + ''; 33 + 34 + postInstall = '' 35 + install -Dm444 langref.html -t $doc/share/doc/zig-$version/html 36 + ''; 37 + }
+4 -1
pkgs/development/compilers/zig/generic.nix
··· 40 40 41 41 # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't 42 42 # work in Nix's sandbox. Use env from our coreutils instead. 43 - postPatch = '' 43 + postPatch = if lib.versionAtLeast args.version "0.12" then '' 44 + substituteInPlace lib/std/zig/system.zig \ 45 + --replace "/usr/bin/env" "${coreutils}/bin/env" 46 + '' else '' 44 47 substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ 45 48 --replace "/usr/bin/env" "${coreutils}/bin/env" 46 49 '';
+4
pkgs/top-level/all-packages.nix
··· 25239 25239 zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { 25240 25240 llvmPackages = llvmPackages_16; 25241 25241 }; 25242 + # requires a newer Apple SDK 25243 + zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { 25244 + llvmPackages = llvmPackages_17; 25245 + }; 25242 25246 zig = zig_0_11; 25243 25247 25244 25248 zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { };