diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-21 11:56:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-21 11:56:50 +0100 |
| commit | 3317eef08420a1561fc42cd97d28fc3eca8c15d7 (patch) | |
| tree | fbafbf4a5857b8c68eb3cb115b65c0586a7f9193 /pkgs/applications/networking | |
| parent | 36fc03edb6ad8f9c5b29bfba43d11d8526e4f682 (diff) | |
| parent | c7e48a3eb8bea1feaa71fc70a6daa0a2e6bcfd71 (diff) | |
| download | nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar.gz nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar.bz2 nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar.lz nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar.xz nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.tar.zst nixlib-3317eef08420a1561fc42cd97d28fc3eca8c15d7.zip | |
Merge #12414: qutebrowser: fix various things
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c1c7a1297ce2..1d53ea2aceb3 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5 -, jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good -, gst_ffmpeg }: +{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5 +, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good +, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: -let version = "0.4.1"; in +let version = "0.5.0"; in -buildPythonPackage { +buildPythonPackage rec { name = "qutebrowser-${version}"; namePrefix = ""; - src = fetchgit { - url = "https://github.com/The-Compiler/qutebrowser.git"; - rev = "8d9e9851f1dcff5deb6363586ad0f1edec040b72"; - sha256 = "1qsdad10swnk14qw4pfyvb94y6valhkscyvl46zbxxs7ck6llsm2"; + src = fetchurl { + url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; + sha256 = "16cyw0jg6qg9ksr6xwgnkm1a2bwgii2s35nrgk3g705ywfsf02j7"; }; # Needs tox doCheck = false; + buildInputs = [ wrapGAppsHook + gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav + glib_networking ]; + propagatedBuildInputs = [ python pyyaml pyqt5 jinja2 pygments pypeg2 ]; makeWrapperArgs = '' - --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" - [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins" ''; |