From 7f0f97c06245b21a51210054e25fceab4b577cea Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Tue, 13 Sep 2016 04:45:37 +0200
Subject: simplify factorio again

---
 ymir/factorio.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'ymir')

diff --git a/ymir/factorio.nix b/ymir/factorio.nix
index 6c0dc246..a7bac033 100644
--- a/ymir/factorio.nix
+++ b/ymir/factorio.nix
@@ -6,10 +6,15 @@ let
     allOptionalMods = false;
   };
   modPortalDrv = { id, name, version, sha256, deps ? [], optionalDeps ? [], recommendedDeps ? [] }: modDrv {
-    src = pkgs.factorio-fetch {
-      name = ''${name}_${version}.zip'';
-      url = ''https://mods.factorio.com/api/downloads/data/mods/${id}_${version}.zip'';
-      inherit sha256;
+    # src = pkgs.factorio-fetch {
+    #   name = ''${name}_${version}.zip'';
+    #   url = ''https://mods.factorio.com/api/downloads/data/mods/${id}_${version}.zip'';
+    #   inherit sha256;
+    #   loginUrl = "";
+    # };
+    src = pkgs.fetchurl {
+      url = ''https://f.141.li/${name}_${version}.zip'';
+      inherit name sha256;
     };
     inherit deps optionalDeps recommendedDeps;
   };
@@ -65,8 +70,6 @@ let
     };
   };
 in {
-  imports = [ ../factorio-credentials.nix ];
-
   services.factorio = {
     enable = true;
     saveName = config.networking.hostName;
@@ -87,7 +90,5 @@ in {
 
   nixpkgs.config.packageOverrides = pkgs: {
     factorio-mkModDirDrv = pkgs.factorio-utils.mkModDirDrv;
-    factorio = pkgs.callPackage ../customized/factorio.nix { releaseType = "alpha"; };
-    factorio-headless = pkgs.callPackage ../customized/factorio.nix { releaseType = "headless"; };
   };
 }
-- 
cgit v1.2.3