ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

zathura: fix cross by disabling tests, adding check

Browse Source 
The only part of zathura that won't cross compile is the tests.

Let's disable these so the binaries at least can be cross-built.

This commit also adds `check` to `buildInputs` and fixes the
reference to `sphinx`.

Co-authored-by: apfelkuchen6 <73002165+apfelkuchen6@users.noreply.github.com>
Co-authored-by: Artturi <Artturin@artturin.com>
This commit is contained in:
Adam Joseph 2023-04-05 16:05:42 -07:00
parent ca50dac040
commit abab00a89c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/zathura/core/default.nix
View File

@ -6,12 +6,12 @@
, gtk-mac-integration , gtk-mac-integration
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "zathura"; pname = "zathura";
version = "0.5.2"; version = "0.5.2";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6";
}; };
@ -25,16 +25,17 @@ stdenv.mkDerivation rec {
"-Dconvert-icon=enabled" "-Dconvert-icon=enabled"
"-Dsynctex=enabled" "-Dsynctex=enabled"
# Make sure tests are enabled for doCheck # Make sure tests are enabled for doCheck
"-Dtests=enabled" (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx
gettext wrapGAppsHook libxml2 check appstream-glib gettext wrapGAppsHook libxml2 appstream-glib
]; ];
buildInputs = [ buildInputs = [
gtk girara libintl sqlite glib file librsvg gtk girara libintl sqlite glib file librsvg check
texlive.bin.core texlive.bin.core
] ++ lib.optional stdenv.isLinux libseccomp ] ++ lib.optional stdenv.isLinux libseccomp
++ lib.optional stdenv.isDarwin gtk-mac-integration; ++ lib.optional stdenv.isDarwin gtk-mac-integration;
@ -48,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ globin ]; maintainers = with maintainers; [ globin ];
}; };
} })