From ed5064c6c5501c204a6310ed1be35e19237aefe8 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 25 Jan 2018 23:38:54 +0000
Subject: [PATCH 1/2] otter-browser: init at 0.9.94

---
 .../networking/browsers/otter/default.nix     | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/otter/default.nix

diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
new file mode 100644
index 000000000000..80e40da269e4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub
+, version ? "0.9.94"
+, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
+}:
+stdenv.mkDerivation {
+  name = "otter-browser-${version}";
+
+  src = fetchFromGitHub {
+    owner = "OtterBrowser";
+    repo = "otter-browser";
+    rev = "v${version}";
+    sha256 = sourceSha;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ];
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5";
+    maintainers = with maintainers; [ lheckemann ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a48f43fc9ffe..2ec0c0b01c0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4780,6 +4780,8 @@ with pkgs;
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
 
+  otter-browser = callPackage ../applications/networking/browsers/otter {};
+
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };

From 49d4e6c01875cc1961d57be35fbc8e4349b437f1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 26 Jan 2018 19:52:34 +0000
Subject: [PATCH 2/2] otter-browser: use qt5.callPackage, fix licence

---
 pkgs/applications/networking/browsers/otter/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index 80e40da269e4..93cf220e4996 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub
+{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
+, qtbase, qtmultimedia, qtwebengine
 , version ? "0.9.94"
 , sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
 }:
@@ -14,10 +15,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ];
+  buildInputs = [ qtbase qtmultimedia qtwebengine ];
 
   meta = with stdenv.lib; {
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5";
     maintainers = with maintainers; [ lheckemann ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ec0c0b01c0f..a7d08635c4be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4780,7 +4780,7 @@ with pkgs;
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
 
-  otter-browser = callPackage ../applications/networking/browsers/otter {};
+  otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
 
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;