From 6639b7f0fdb061b4d0fc072c99afb9381b418f8b Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 14 May 2024 17:00:35 -0500 Subject: [PATCH] update --- flake.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 5c80e09..c64980b 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ flake-utils.lib.eachDefaultSystem ( system: let - version = self.lastModifiedDate; + # version = self.lastModifiedDate; pkgs = import nixpkgs { inherit system; config.permittedInsecurePackages = [ @@ -44,6 +44,9 @@ "python3.11-cryptography-40.0.2" ]; }; + zig_hook = pkgs.zig_0_12.hook.overrideAttrs { + zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast"; + }; make-shell = import inputs.make-shell { inherit system pkgs; }; @@ -80,10 +83,10 @@ }; hostapps-zig = let cache = src: - pkgs.stdenvNoCC.mkDerivation { + pkgs.stdenv.mkDerivation { inherit src; name = "hostapps-zig-cache"; - nativeBuildInputs = [pkgs.git pkgs.zig_0_12.hook]; + nativeBuildInputs = [pkgs.git zig_hook]; # buildInputs = [ # pkgs.zig_0_12 # ]; @@ -108,11 +111,12 @@ cp -r --reflink=auto $ZIG_GLOBAL_CACHE_DIR $out runHook postInstall ''; - outputHash = "sha256-1RX8LJCu8jfGOfHj0uQrVk4ltjVm/q7YyH4EfDmsG1c="; + # outputHash = pkgs.lib.fakeHash; + outputHash = "sha256-DilCltrfYt7XpHbNNyylBwhantmhNkhHxILjhdmUqOA="; outputHashMode = "recursive"; }; in - pkgs.stdenvNoCC.mkDerivation ( + pkgs.stdenv.mkDerivation ( attrs: { pname = "hostapps-zig"; version = "0.0.0"; @@ -121,7 +125,7 @@ nativeBuildInputs = [ pkgs.git - pkgs.zig_0_12.hook + zig_hook ]; # buildInputs = [