about summary refs log tree commit diff
path: root/humblebundle/fetch-humble-bundle/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-02-08 22:06:10 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-02-08 22:06:10 +0100
commit5570ec94ffe086f1ff47ad99606d39eb7b815dd1 (patch)
tree71cb764b02d41b1438642b226a3e2840e01caaa6 /humblebundle/fetch-humble-bundle/default.nix
parentdbac077ce8ec5a1cc2ddbc8faf335966255a9504 (diff)
parenteba220a4dcce16d02921b27419f039743f1c088f (diff)
Merge pull request aszlig/nixgames#1 from @layus
This adds Unepic to the humblebundle games list and also fixes Bastion,
or at least it *should* fix Bastion.

I have tested Unepic, though I had to fix the download, which I'm going
to commit later.

As for Bastion, at least with the humblebundle fetcher it's not able to
fetch "bastion_linux" (it doesn't even show up), however on my Humble
library I can see the download (maybe it's because I bought this along
with HIB 5).

Nevertheless, it's at least a small step forward and we need to fix
these issues later.
Diffstat (limited to 'humblebundle/fetch-humble-bundle/default.nix')
-rw-r--r--humblebundle/fetch-humble-bundle/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/humblebundle/fetch-humble-bundle/default.nix b/humblebundle/fetch-humble-bundle/default.nix
index c37e2043..fbabaa8c 100644
--- a/humblebundle/fetch-humble-bundle/default.nix
+++ b/humblebundle/fetch-humble-bundle/default.nix
@@ -4,7 +4,7 @@
 , email, password
 }:
 
-{ machineName, downloadName ? "Download", suffix ? "humblebundle", md5 }: let
+{ name ? null, machineName, downloadName ? "Download", suffix ? "humblebundle", md5 }: let
   cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   humbleAPI = buildPythonPackage rec {
@@ -72,7 +72,7 @@
       print dstruct.url.web
   '';
 in stdenv.mkDerivation {
-  name = "${machineName}.${suffix}";
+  name = if name != null then name else "${machineName}.${suffix}";
   outputHashAlgo = "md5";
   outputHash = md5;