diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-13 21:07:04 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-01-15 05:35:20 +0100 |
| commit | fe1ba3c9be690ce82e3f008912cc6a50bb2cc4b3 (patch) | |
| tree | 3d31f664c7c3fd1edc4c9f01e54748701cbd4361 /pkgs/applications/misc/xiphos | |
| parent | 2efc97211316560936d8b69f6c5ce8e7af74ff8e (diff) | |
xiphos: clean up the expression
- attribute ordering
Diffstat (limited to 'pkgs/applications/misc/xiphos')
| -rw-r--r-- | pkgs/applications/misc/xiphos/default.nix | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 87656db5e5f90..1584482fcf8b7 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,5 +1,5 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchFromGitHub , fetchpatch , appstream-glib @@ -60,14 +60,26 @@ stdenv.mkDerivation rec { hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8="; }; + 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"; + sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0="; + }) + ]; + + patchFlags = [ "-p0" ]; + nativeBuildInputs = [ - appstream-glib + appstream-glib # for appstream-util cmake - desktop-file-utils + desktop-file-utils # for desktop-file-validate itstool pkg-config wrapGAppsHook - yelp-tools + yelp-tools # for yelp-build ]; buildInputs = [ @@ -107,12 +119,10 @@ stdenv.mkDerivation rec { sqlite sword webkitgtk + xorg.libXdmcp + xorg.libXtst zip - ] - ++ (with xorg; [ - libXdmcp - libXtst - ]); + ]; cmakeFlags = [ "-DDBUS=OFF" @@ -127,18 +137,6 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - patchFlags = [ "-p0" ]; - - 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"; - sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0="; - }) - ]; - meta = with lib; { description = "A GTK Bible study tool"; longDescription = '' |