From 5ac6c298d152c93277098064b6e47051d10eb558 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 8 Jul 2026 13:14:48 +0200 Subject: [PATCH] fix sourcemod building --- nix/metamod-source.nix | 12 ++++++------ nix/sourcemod.nix | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nix/metamod-source.nix b/nix/metamod-source.nix index d636a58..78372cd 100644 --- a/nix/metamod-source.nix +++ b/nix/metamod-source.nix @@ -14,17 +14,17 @@ paths = attrValues sdks; }; in - multiStdenv.mkDerivation rec { + multiStdenv.mkDerivation (finalAttrs: { pname = "metamod-source"; - version = "1.12"; + version = "1.12.0.1224"; NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=template-id-cdtor"; src = fetchFromGitHub { owner = "alliedmodders"; - repo = pname; - rev = "02ee4a312525d17b2f6d2f21a953d06"; - sha256 = "sha256-Q+MDJsB6bDWos04gkzr2QY8Bn+vDmHM0ljQy80FlKzM="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + sha256 = "sha256-zH1ww22D0Ksthl7aTVbegrO/dnLCyV7mz1CQ9SeyOBY="; fetchSubmodules = true; }; @@ -54,4 +54,4 @@ in mv package $out/share cp -r $src $out/include ''; - } + }) diff --git a/nix/sourcemod.nix b/nix/sourcemod.nix index fae4876..371408d 100644 --- a/nix/sourcemod.nix +++ b/nix/sourcemod.nix @@ -24,20 +24,20 @@ # ambuild doesn't allow configuring a target prefix for "ar" arWrapper = writeShellScriptBin "ar" "exec -a $0 ${stdenv.cc.targetPrefix}ar $@"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "sourcemod"; - version = "1.12"; + version = "1.12.0.7239"; NIX_CFLAGS_COMPILE = - "-Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=reorder -Wno-error=sign-compare " + "-Wno-error -Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=reorder -Wno-error=sign-compare " + "-Wno-error=stringop-truncation -Wno-error=dangling-pointer -Wno-error=template-id-cdtor -Wno-error=format-security " + "-Wno-error=deprecated-declarations -Wno-error=stringop-overread"; src = fetchFromGitHub { owner = "alliedmodders"; - repo = pname; - rev = "5c407d494889dd1b6b2187bbc31ac82"; - sha256 = "sha256-e9qlBMHCMbG1F+yacO4p4+nm32wfBoVPsIqwR79agWw="; + repo = finalAttrs.pname; + rev = "b951843d42f7b9204615c14885468ea131a24002"; + sha256 = "sha256-aulM6fzXcmQf0xztWDRyxbH02mTGJKPMqpUMUSeNbaM="; fetchSubmodules = true; }; @@ -66,4 +66,4 @@ in mkdir $out mv package $out/share ''; - } + })