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

falkon: 2.1.2.1 -> 2.1.99.1

Browse Source
This commit is contained in:
Peter Hoeg 2018-02-17 18:06:08 +08:00
parent faf072166b
commit 9c9b6874d0
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/browsers/falkon/default.nix
View File

@ -2,16 +2,17 @@
, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a # KDE hasn't made a release of falkon yet so we just track git for now which is
# release but it is basically 2.1.2 with the falkon name # based on the most recent release of qupzilla
# This wip version is 2.1.99 so we add the .1
name = "falkon-${version}.1"; name = "falkon-${version}.1";
version = "2.1.2"; version = "2.1.99";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KDE"; owner = "KDE";
repo = "falkon"; repo = "falkon";
rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; rev = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495";
sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d";
}; };
preConfigure = '' preConfigure = ''
@ -21,8 +22,6 @@ stdenv.mkDerivation rec {
export FALKON_PREFIX=$out export FALKON_PREFIX=$out
''; '';
dontUseCmakeConfigure = true;
buildInputs = [ buildInputs = [
libpthreadstubs libxcb libXdmcp libpthreadstubs libxcb libXdmcp
kwallet kwallet
@ -31,8 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; 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 = true;
enableParallelBuilding = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "QtWebEngine based cross-platform web browser"; description = "QtWebEngine based cross-platform web browser";
@ -40,6 +38,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;
broken = true;
}; };
} }