0ad 0.0.24

flake.lock

@@ -52,11 +52,28 @@
         "type": "github"
       }
     },
+    "nixpkgsFor0AD": {
+      "locked": {
+        "lastModified": 1614186703,
+        "narHash": "sha256-eVWRScBdmsdgMv6UHrntBxAxKylXBYzzeFahf9RFEuE=",
+        "owner": "charvp",
+        "repo": "nixpkgs",
+        "rev": "e9f0809cc1c48707f4a95a845bcb0e98d98ede36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "charvp",
+        "ref": "0ad0.24",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgsFor0AD": "nixpkgsFor0AD"
       }
     }
   },

flake.nix

@@ -8,9 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:charvp/nixpkgs/master";
+    nixpkgsFor0AD.url = "github:charvp/nixpkgs/0ad0.24";
   };
 
-  outputs = { self, nixpkgs, home-manager, flake-utils }:
+  outputs = { self, nixpkgs, nixpkgsFor0AD, home-manager, flake-utils }:
     let
       version-suffix = nixpkgs.rev or (builtins.toString nixpkgs.lastModified);
       pkgsFor = system: import nixpkgs {
@@ -18,6 +19,7 @@
       };
       mkSystem = system: hostname: nixpkgs.lib.nixosSystem {
         inherit system;
+        extraArgs = { pkgsFor0AD = import nixpkgsFor0AD { inherit system; }; };
         modules = [
           home-manager.nixosModules.home-manager
           (./modules)

modules/zeroad.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, pkgsFor0AD, ... }:
 
 {
   options = {
@@ -19,13 +19,9 @@
       { path = ".config/0ad"; type = "cache"; }
     ];
 
-    nixpkgs.config.permittedInsecurePackages = [
-      "spidermonkey-38.8.0"
-    ];
-
     hardware.opengl.enable = true;
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ pkgs.zeroad ];
+      home.packages = [ pkgsFor0AD.zeroad ];
     };
     networking.firewall = lib.mkIf config.chvp.zeroad.asServer {
       allowedTCPPorts = [ 20595 ];