Commit 2055acbb authored by emaryn's avatar emaryn
Browse files

xiphos: 4.2.1 -> 4.3.2

parent 890df368

pkgs/by-name/xi/xiphos/0001-Add-dbus-glib-dependency-to-main.patch

+6 −3
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt 
index 49b86371..bb8e4bb6 100644

--- a/src/main/CMakeLists.txt

+++ b/src/main/CMakeLists.txt

@@ -74,3 +74,14 @@ target_link_libraries(main

   PkgConfig::Sword

@@ -77,6 +77,17 @@

   PkgConfig::Biblesync

   )

+



+IF (DBUS)

+  target_include_directories (main

+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
@@ -33,6 +32,10 @@ index 49b86371..bb8e4bb6 100644 
+    PkgConfig::DBus

+    )

+ENDIF (DBUS)

+

 if(WK_FOUND)

   target_compile_definitions(main

     PRIVATE

-- 

2.34.1

pkgs/by-name/xi/xiphos/package.nix

+9 −25
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  appstream-glib,

  biblesync,

  cmake,
@@ -10,46 +9,34 @@ 
  desktop-file-utils,

  docbook2x,

  docbook_xml_dtd_412,

  enchant2,

  glib,

  gtk3,

  gtkhtml,

  icu,

  intltool,

  isocodes,

  itstool,

  libuuid,

  libxslt,

  minizip,

  pkg-config,

  sword,

  webkitgtk_4_0,

  webkitgtk_4_1,

  wrapGAppsHook3,

  yelp-tools,

  zip,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "xiphos";

  version = "4.2.1";

  version = "4.3.2";



  src = fetchFromGitHub {

    owner = "crosswire";

    repo = "xiphos";

    rev = version;

    hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8=";

    tag = finalAttrs.version;

    hash = "sha256-HTndBWfze8tV4G9npLYB7SkgpJNQcQBZqHKjxhZU6JY=";

  };



  patches = [

    # GLIB_VERSION_MIN_REQUIRED is not defined.

    # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874

    (fetchpatch {

      name = "xiphos-glibc.patch";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8";

      sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck=";

      extraPrefix = "";

    })



    # Fix D-Bus build

    # https://github.com/crosswire/xiphos/pull/1103

    ./0001-Add-dbus-glib-dependency-to-main.patch
@@ -73,16 +60,13 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    biblesync

    dbus-glib

    enchant2

    glib

    gtk3

    gtkhtml

    icu

    isocodes

    libuuid

    minizip

    sword

    webkitgtk_4_0

    webkitgtk_4_1

  ];



  cmakeFlags = [
@@ -92,7 +76,7 @@ stdenv.mkDerivation rec { 


  preConfigure = ''

    # The build script won't continue without the version saved locally.

    echo "${version}" > cmake/source_version.txt

    echo "${finalAttrs.version}" > cmake/source_version.txt



    export SWORD_HOME=${sword};

  '';
@@ -110,4 +94,4 @@ stdenv.mkDerivation rec { 
    maintainers = [ ];

    platforms = lib.platforms.linux;

  };

}
 
})