From 236f8c720da861408029c65e07b32b545365ab70 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 8 Jun 2015 19:33:23 +0200
Subject: [PATCH 1/4] added popcorntime package

---
 .../video/popcorntime/default.nix             | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/video/popcorntime/default.nix

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
new file mode 100644
index 00000000000..80ec5051dae
--- /dev/null
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+}:
+
+let
+  node-webkit = node_webkit_0_9;
+  version = "0.3.7.2";
+  popcorntimePackage = stdenv.mkDerivation rec {
+    name = "popcorntime-package-${version}";
+    src = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
+     sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+    };
+    sourceRoot = ".";
+    installPhase = ''
+      mkdir -p $out
+      cp -r *.so *.pak $out/
+      cat ${node-webkit}/bin/nw package.nw > $out/Popcorn-Time
+      chmod 555 $out/Popcorn-Time
+    '';
+  };
+in
+  runCommand "popcorntime-${version}" {
+    buildInputs = [ makeWrapper ];
+    meta = with stdenv.lib; {
+      homepage = http://popcorntime.io/;
+      description = "An application that streams movies and TV shows from torrents";
+      license = stdenv.lib.licenses.gpl3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ bobvanderlinden ];
+    };
+  }
+  ''
+    mkdir -p $out/bin
+    makeWrapper ${popcorntimePackage}/Popcorn-Time $out/bin/popcorntime
+  ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7a08a42898..ffc4f347b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2582,6 +2582,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  popcorntime = callPackage ../applications/video/popcorntime { };
+
   ponysay = callPackage ../tools/misc/ponysay { };
 
   povray = callPackage ../tools/graphics/povray {

From f2f0d98e53d6960610b2d811a8a364e7fa235417 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 19 Jun 2015 23:18:05 +0200
Subject: [PATCH 2/4] popcorntime: added support for i686-linux

---
 pkgs/applications/video/popcorntime/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 80ec5051dae..8d294325a91 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -4,12 +4,21 @@
 let
   node-webkit = node_webkit_0_9;
   version = "0.3.7.2";
+
+  srcs = {
+    x86_64-linux = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
+      sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+    };
+    i686-linux = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
+      sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
+    };
+  };
+
   popcorntimePackage = stdenv.mkDerivation rec {
     name = "popcorntime-package-${version}";
-    src = fetchurl {
-      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
-     sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-    };
+    src = srcs."${stdenv.system}";
     sourceRoot = ".";
     installPhase = ''
       mkdir -p $out

From e315d0599df1ba01a4bc9edbc1197a2544058d49 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 19 Jun 2015 23:19:00 +0200
Subject: [PATCH 3/4] popcorntime: allow different versions of node_webkit

---
 pkgs/applications/video/popcorntime/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 8d294325a91..ab22a30d866 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit ? pkgs.node_webkit_0_9
 }:
 
 let
-  node-webkit = node_webkit_0_9;
   version = "0.3.7.2";
 
   srcs = {
@@ -23,7 +22,7 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r *.so *.pak $out/
-      cat ${node-webkit}/bin/nw package.nw > $out/Popcorn-Time
+      cat ${node_webkit}/bin/nw package.nw > $out/Popcorn-Time
       chmod 555 $out/Popcorn-Time
     '';
   };

From bb10e48573ee9cd644fa7ecaf64ea5586b4ffc8d Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 25 Jun 2015 19:05:52 +0200
Subject: [PATCH 4/4] popcorntime: don't use pkgs in argument

---
 pkgs/applications/video/popcorntime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index ab22a30d866..0db56cc6fcd 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit ? pkgs.node_webkit_0_9
+{ stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9
 }:
 
 let
@@ -22,7 +22,7 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r *.so *.pak $out/
-      cat ${node_webkit}/bin/nw package.nw > $out/Popcorn-Time
+      cat ${node_webkit_0_9}/bin/nw package.nw > $out/Popcorn-Time
       chmod 555 $out/Popcorn-Time
     '';
   };