drop broken websocket stuff

flake.nix

@@ -55,6 +55,7 @@
           "sourcemod-include-curl"
           "sourcemod-include-library"
           "sourcemod-include-steamworks"
+          "sourcemod-include-sha1"
           "srcds-tf2"
           "sourcemod-addon-curl"
           "sourcemod-addon-steamworks"
@@ -71,7 +72,6 @@
           "sourcemod-plugin-setteam"
           "sourcemod-plugin-banned"
           "sourcemod-plugin-who"
-          "sourcemod-plugin-webrcon"
           "sourcemod-plugin-afk"
         ]
         // {
@@ -98,6 +98,11 @@
                 sha256 = "sha256-Z3RJhuc9c8YQTo9gnLTBrqL4JpADZgDttrJVyE/MWdM=";
               };
             };
+          spEnv = pkgs:
+            pkgs.sourcepawn.buildEnv (with pkgs; [
+              sourcemod-includes
+              sourcemod-addon-socket
+            ]);
         };
 
       checks = {

nix/sourcemod/addons/socket.nix

@@ -52,7 +52,9 @@ in
       runHook preInstall
 
       mkdir -p $out/addons/sourcemod/extensions/x64
+      mkdir -p $out/addons/sourcemod/scripting/include
       cp Release/socket.ext.so $out/addons/sourcemod/extensions/x64
+      cp socket.inc $out/addons/sourcemod/scripting/include
 
       runHook postInstall
     '';

nix/sourcemod/includes/overlay.nix

@@ -1,4 +1,5 @@
 final: prev: {
+  sourcemod-includes = final.callPackage ./sourcemod-includes.nix {};
   sourcemod-include-library = final.callPackage ./sourcemod-include-library.nix {};
   sourcemod-include-curl = final.callPackage ./curl.nix {};
   sourcemod-include-steamworks = final.callPackage ./steamworks.nix {};

nix/sourcemod/plugins/builder/plugin.nix

@@ -6,20 +6,23 @@
 }:
 lib.extendMkDerivation {
   constructDrv = stdenvNoCC.mkDerivation;
-  excludeDrvArgNames = ["includes" "plugin"];
+  excludeDrvArgNames = ["includes" "plugin" "installIncludes"];
   extendDrvArgs = finalAttrs: {
     includes ? [],
     plugins,
+    installIncludes ? [],
     src,
     ...
   }: let
-    inherit (lib) concatStringsSep map;
+    inherit (lib) concatStringsSep map length optionalString;
     spcomp = sourcepawn.buildEnv ([
         sourcemod-includes
         finalAttrs.src
       ]
       ++ includes);
     spCompLines = concatStringsSep "\n" (map (plugin: "spcomp ${plugin}") plugins);
+    createInclude = optionalString ((length installIncludes) > 0) "mkdir -p $out/addons/sourcemod/scripting/include/";
+    installLines = concatStringsSep "\n" (map (installInclude: "cp '${installInclude}' $out/addons/sourcemod/scripting/include/") installIncludes);
   in {
     nativeBuildInputs = [spcomp];
 
@@ -38,6 +41,9 @@ lib.extendMkDerivation {
       mkdir -p $out/addons/sourcemod/plugins/
       mv *.smx $out/addons/sourcemod/plugins/
 
+      ${createInclude}
+      ${installLines}
+
       runHook postInstall
     '';
   };

nix/sourcemod/plugins/overlay.nix

@@ -14,6 +14,5 @@ final: prev: {
   sourcemod-plugin-setteam = final.callPackage ./setteam.nix {};
   sourcemod-plugin-banned = final.callPackage ./banned.nix {};
   sourcemod-plugin-who = final.callPackage ./who.nix {};
-  sourcemod-plugin-webrcon = final.callPackage ./webrcon.nix {};
   sourcemod-plugin-afk = final.callPackage ./afk.nix {};
 }

nix/sourcemod/plugins/webrcon.nix

@@ -1,7 +0,0 @@
-{mkSpirePlugin}:
-mkSpirePlugin {
-  name = "webrcon";
-  version = "0-unstable-2020-05-08";
-  rev = "d407f5b2e85432b9cbd8e8e5ff2a8a2a08a816e9";
-  hash = "sha256-EuskFNEutkBOQJb03BYD7mvD3CDqEM3jvzpazLIdZTM=";
-}

nix/sourcemod/sourcepawn.nix

@@ -73,6 +73,13 @@
           paths = imports ++ [self];
           postBuild = ''
             mv $out/bin/spcomp{,.unwrapped}
+            mkdir -p $out/include/
+            if [ -d "$out/addons/sourcemod/scripting/include" ]; then
+                ln -sf $out/addons/sourcemod/scripting/include/* $out/include/
+            fi
+            if [ -d "$out/scripting/include" ]; then
+                ln -sf $out/scripting/include/* $out/include/
+            fi
           '';
         };
         wrapped = writeShellScriptBin "spcomp" "exec -a $0 ${unwrapped}/bin/spcomp.unwrapped $@";