From 83782b156896794d6b82c98f2e70223ec482a534 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 9 Apr 2025 23:00:16 -0700 Subject: [PATCH] blackshades: 2.5.1 -> 2.5.2-unstable-2025-03-12 --- pkgs/by-name/bl/blackshades/package.nix | 35 +++++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index acdc2e385849..ec2bdfe33d4e 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -7,22 +7,47 @@ libGLU, libsndfile, openal, - zig_0_11, + zig_0_14, + runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "blackshades"; - version = "2.5.1"; + version = "2.5.2-unstable-2025-03-12"; src = fetchFromSourcehut { owner = "~cnx"; repo = "blackshades"; - rev = finalAttrs.version; + rev = "a2fbe0e08bedbbbb1089dbb8f3e3cb4d76917bd0"; fetchSubmodules = true; - hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM="; + hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + postUnpack = '' + ln -s ${ + runCommand "${finalAttrs.finalPackage.name}-zig-deps" + { + inherit (finalAttrs) src; + + nativeBuildInputs = [ zig_0_14 ]; + + outputHashAlgo = null; + outputHashMode = "recursive"; + outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM="; + } + '' + export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + + runHook unpackPhase + cd $sourceRoot + + zig build --fetch + mv $ZIG_GLOBAL_CACHE_DIR/p $out + '' + } $ZIG_GLOBAL_CACHE_DIR/p + ''; + + nativeBuildInputs = [ zig_0_14.hook ]; buildInputs = [ glfw