tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
otter-browser: use qt5.callPackage, fix licence
Linus Heckemann
8 years ago
49d4e6c0
ed5064c6
+5
-4
2 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
browsers
otter
default.nix
top-level
all-packages.nix
+4
-3
pkgs/applications/networking/browsers/otter/default.nix
···
1
1
-
{ stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub
1
1
+
{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
2
2
+
, qtbase, qtmultimedia, qtwebengine
2
3
, version ? "0.9.94"
3
4
, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
4
5
}:
···
14
15
15
16
nativeBuildInputs = [ cmake ];
16
17
17
17
-
buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ];
18
18
+
buildInputs = [ qtbase qtmultimedia qtwebengine ];
18
19
19
20
meta = with stdenv.lib; {
20
20
-
license = licenses.gpl3;
21
21
+
license = licenses.gpl3Plus;
21
22
description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5";
22
23
maintainers = with maintainers; [ lheckemann ];
23
24
};
+1
-1
pkgs/top-level/all-packages.nix
···
4780
4780
4781
4781
staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
4782
4782
4783
4783
-
otter-browser = callPackage ../applications/networking/browsers/otter {};
4783
4783
+
otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
4784
4784
4785
4785
privoxy = callPackage ../tools/networking/privoxy {
4786
4786
w3m = w3m-batch;