diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-07 15:03:59 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-07 15:03:59 +0100 |
| commit | 8162d6c037ff6439903a6027669f5ad01309dc38 (patch) | |
| tree | 3c3dd30610106015af1a61cf1c4479dba9acacff /pkgs/applications/misc/bibletime | |
| parent | ef4c3a352b4e513cd33ca195e158ea79d318a00f (diff) | |
| download | nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar.gz nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar.bz2 nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar.lz nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar.xz nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.tar.zst nixpkgs-8162d6c037ff6439903a6027669f5ad01309dc38.zip | |
bibletime: 2.10.1 -> 2.11.2
Diffstat (limited to 'pkgs/applications/misc/bibletime')
| -rw-r--r-- | pkgs/applications/misc/bibletime/default.nix | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index a3f0a3b84f2..a467a7eff9b 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,28 +1,25 @@ -{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}: +{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +, qtbase, qttools, qtsvg, qtwebkit +}: stdenv.mkDerivation rec { - version = "2.10.1"; + version = "2.11.2"; pname = "bibletime"; src = fetchurl { url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; - sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; + sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - prePatch = '' - patchShebangs .; - ''; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + sword boost clucene_core + qtbase qttools qtsvg qtwebkit + ]; - preConfigure = '' - export CLUCENE_HOME=${clucene_core}; - export SWORD_HOME=${sword}; - ''; - - buildInputs = [ cmake sword qt4 boost clucene_core ]; - - cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" ]; meta = { description = "A Qt4 Bible study tool"; |