diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index ec767a3..fd001d0 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: name: link instance: https://cache.icewind.link authToken: "${{ secrets.ATTIC_TOKEN }}" - - run: nix flake check --keep-going + - run: nix flake check --keep-going --option system i686-linux sourcemod: runs-on: nix diff --git a/flake.nix b/flake.nix index b317020..ce4e3f7 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,7 @@ "sourcemod-include-curl" "sourcemod-include-library" "sourcemod-include-steamworks" + "sourcemod-include-json" "srcds-tf2" "srctvplus" "sourcemod-addon-curl" diff --git a/nix/sourcemod/includes/json.nix b/nix/sourcemod/includes/json.nix new file mode 100644 index 0000000..be46222 --- /dev/null +++ b/nix/sourcemod/includes/json.nix @@ -0,0 +1,33 @@ +{ + stdenv, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sourcemod-include-json"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "clugg"; + repo = "sm-json"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XkqLDBd0o/DMKDs3Z8JPUVBfEmuM45jxa58flGy6+08="; + }; + + doConfigure = false; + doBuild = false; + + installPhase = '' + mkdir $out + cp -r addons/sourcemod/scripting/include $out + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--flake" + "--version=branch" + ]; + }; + }; +}) diff --git a/nix/sourcemod/includes/overlay.nix b/nix/sourcemod/includes/overlay.nix index 6988e16..4ed3395 100644 --- a/nix/sourcemod/includes/overlay.nix +++ b/nix/sourcemod/includes/overlay.nix @@ -3,4 +3,5 @@ final: prev: { sourcemod-include-library = final.callPackage ./sourcemod-include-library.nix {}; sourcemod-include-curl = final.callPackage ./curl.nix {}; sourcemod-include-steamworks = final.callPackage ./steamworks.nix {}; + sourcemod-include-json = final.callPackage ./json.nix {}; } diff --git a/nix/sourcemod/sourcepawn.nix b/nix/sourcemod/sourcepawn.nix index 11b01d3..78f2ccc 100644 --- a/nix/sourcemod/sourcepawn.nix +++ b/nix/sourcemod/sourcepawn.nix @@ -10,6 +10,7 @@ sourcemod-include-curl, sourcemod-include-library, sourcemod-include-steamworks, + sourcemod-include-json, runCommand, }: let inherit (builtins) concatStringsSep substring stringLength; @@ -66,6 +67,7 @@ sourcemod = sourcemod-includes; curl = sourcemod-include-curl; steamworks = sourcemod-include-steamworks; + json = sourcemod-include-json; }; buildEnv = imports: let unwrapped = symlinkJoin {