Merge branch 'master.upstream' into staging.upstream

1 files changed, 33 insertions, 16 deletions

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index c588833b2f084..45d8c452111fa 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,24 +1,41 @@
-{ stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9,
+  fromCi ? true,
+  build ? "652",
+  version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2"
 }:
 
 let
-  version = "0.3.7.2";
+  config = 
+    if stdenv.system == "x86_64-linux" then 
+      {sys = "Linux32"; 
+       sha256 = 
+          if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy"
+                    else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+      }
+    else if stdenv.system == "i686-linux" then 
+      {sys = "Linux64"; 
+       sha256 = 
+        if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f"
+                  else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
+      }
+    else throw "Unsupported system ${stdenv.system}";
+
+  fetchurlConf = 
+    let
+      ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time";
+      relBase = "https://get.popcorntime.io/build";
+    in {
+      url = 
+        if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz"
+        else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz";
+      sha256 = config.sha256;
+    };
 
   popcorntimePackage = stdenv.mkDerivation rec {
-    name = "popcorntime-package-${version}";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
-          sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-        }
-      else if stdenv.system == "i686-linux" then
-        fetchurl {
-          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
-          sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
-        }
-      else
-        throw "Unsupported system ${stdenv.system}";
+    name = 
+      if fromCi then "popcorntime-git-2015-07-07"
+                else "popcorntime-${version}";
+    src = fetchurl fetchurlConf;
     sourceRoot = ".";
     installPhase = ''
       mkdir -p $out