public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

otter-browser: use qt5.callPackage, fix licence

Browse Source
This commit is contained in:
Linus Heckemann 2018-01-26 19:52:34 +00:00
parent ed5064c6c5
commit 49d4e6c018
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/otter/default.nix
View File

@ -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" , version ? "0.9.94"
, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" , sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
}: }:
@ -14,10 +15,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ]; buildInputs = [ qtbase qtmultimedia qtwebengine ];
meta = with stdenv.lib; { 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"; description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5";
maintainers = with maintainers; [ lheckemann ]; maintainers = with maintainers; [ lheckemann ];
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -4780,7 +4780,7 @@ with pkgs;
staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; 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 { privoxy = callPackage ../tools/networking/privoxy {
w3m = w3m-batch; w3m = w3m-batch;