otter-browser: use qt5.callPackage, fix licence

+5 -4
+4 -3
pkgs/applications/networking/browsers/otter/default.nix
··· 1 - { stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub 2 , version ? "0.9.94" 3 , sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" 4 }: ··· 14 15 nativeBuildInputs = [ cmake ]; 16 17 - buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ]; 18 19 meta = with stdenv.lib; { 20 - license = licenses.gpl3; 21 description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; 22 maintainers = with maintainers; [ lheckemann ]; 23 };
··· 1 + { stdenv, cmake, openssl, gst_all_1, fetchFromGitHub 2 + , qtbase, qtmultimedia, qtwebengine 3 , version ? "0.9.94" 4 , sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" 5 }: ··· 15 16 nativeBuildInputs = [ cmake ]; 17 18 + buildInputs = [ qtbase qtmultimedia qtwebengine ]; 19 20 meta = with stdenv.lib; { 21 + license = licenses.gpl3Plus; 22 description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; 23 maintainers = with maintainers; [ lheckemann ]; 24 };
+1 -1
pkgs/top-level/all-packages.nix
··· 4780 4781 staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; 4782 4783 - otter-browser = callPackage ../applications/networking/browsers/otter {}; 4784 4785 privoxy = callPackage ../tools/networking/privoxy { 4786 w3m = w3m-batch;
··· 4780 4781 staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; 4782 4783 + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; 4784 4785 privoxy = callPackage ../tools/networking/privoxy { 4786 w3m = w3m-batch;