This commit is contained in:
Jeffrey C. Ollie 2024-05-14 17:00:35 -05:00
parent de8eaf2519
commit 6639b7f0fd
Signed by: jeff
GPG key ID: 6F86035A6D97044E

View file

@ -36,7 +36,7 @@
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
( (
system: let system: let
version = self.lastModifiedDate; # version = self.lastModifiedDate;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.permittedInsecurePackages = [ config.permittedInsecurePackages = [
@ -44,6 +44,9 @@
"python3.11-cryptography-40.0.2" "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 { make-shell = import inputs.make-shell {
inherit system pkgs; inherit system pkgs;
}; };
@ -80,10 +83,10 @@
}; };
hostapps-zig = let hostapps-zig = let
cache = src: cache = src:
pkgs.stdenvNoCC.mkDerivation { pkgs.stdenv.mkDerivation {
inherit src; inherit src;
name = "hostapps-zig-cache"; name = "hostapps-zig-cache";
nativeBuildInputs = [pkgs.git pkgs.zig_0_12.hook]; nativeBuildInputs = [pkgs.git zig_hook];
# buildInputs = [ # buildInputs = [
# pkgs.zig_0_12 # pkgs.zig_0_12
# ]; # ];
@ -108,11 +111,12 @@
cp -r --reflink=auto $ZIG_GLOBAL_CACHE_DIR $out cp -r --reflink=auto $ZIG_GLOBAL_CACHE_DIR $out
runHook postInstall runHook postInstall
''; '';
outputHash = "sha256-1RX8LJCu8jfGOfHj0uQrVk4ltjVm/q7YyH4EfDmsG1c="; # outputHash = pkgs.lib.fakeHash;
outputHash = "sha256-DilCltrfYt7XpHbNNyylBwhantmhNkhHxILjhdmUqOA=";
outputHashMode = "recursive"; outputHashMode = "recursive";
}; };
in in
pkgs.stdenvNoCC.mkDerivation ( pkgs.stdenv.mkDerivation (
attrs: { attrs: {
pname = "hostapps-zig"; pname = "hostapps-zig";
version = "0.0.0"; version = "0.0.0";
@ -121,7 +125,7 @@
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.git pkgs.git
pkgs.zig_0_12.hook zig_hook
]; ];
# buildInputs = [ # buildInputs = [