diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-02-17 18:06:08 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2018-02-17 18:12:01 +0800 |
commit | 9c9b6874d02491b0e2bdac500a36124e25fa8714 (patch) | |
tree | d51ce9839c0f0eda8f79484bdb06bec218cbf4c6 | |
parent | faf072166b717091bfc2fb8d8bcb54379197ac32 (diff) | |
download | nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar.gz nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar.bz2 nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar.lz nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar.xz nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.tar.zst nixlib-9c9b6874d02491b0e2bdac500a36124e25fa8714.zip |
falkon: 2.1.2.1 -> 2.1.99.1
-rw-r--r-- | pkgs/applications/networking/browsers/falkon/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9356794bb5d6..90aec9831930 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -2,16 +2,17 @@ , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: stdenv.mkDerivation rec { - # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a - # release but it is basically 2.1.2 with the falkon name + # KDE hasn't made a release of falkon yet so we just track git for now which is + # based on the most recent release of qupzilla + # This wip version is 2.1.99 so we add the .1 name = "falkon-${version}.1"; - version = "2.1.2"; + version = "2.1.99"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; - rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; - sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + rev = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495"; + sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d"; }; preConfigure = '' @@ -21,8 +22,6 @@ stdenv.mkDerivation rec { export FALKON_PREFIX=$out ''; - dontUseCmakeConfigure = true; - buildInputs = [ libpthreadstubs libxcb libXdmcp kwallet @@ -31,8 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = true; }; } |