libjcat: init at 0.1.1

Changed files
+123
nixos
tests
installed-tests
pkgs
development
top-level
+1
nixos/tests/installed-tests/default.nix
···
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
glib-testing = callInstalledTest ./glib-testing.nix {};
libxmlb = callInstalledTest ./libxmlb.nix {};
malcontent = callInstalledTest ./malcontent.nix {};
ostree = callInstalledTest ./ostree.nix {};
···
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
glib-testing = callInstalledTest ./glib-testing.nix {};
+
libjcat = callInstalledTest ./libjcat.nix {};
libxmlb = callInstalledTest ./libxmlb.nix {};
malcontent = callInstalledTest ./malcontent.nix {};
ostree = callInstalledTest ./ostree.nix {};
+5
nixos/tests/installed-tests/libjcat.nix
···
···
+
{ pkgs, makeInstalledTest, ... }:
+
+
makeInstalledTest {
+
tested = pkgs.libjcat;
+
}
+91
pkgs/development/libraries/libjcat/default.nix
···
···
+
{ stdenv
+
, fetchFromGitHub
+
, fetchpatch
+
, docbook_xml_dtd_43
+
, docbook-xsl-nons
+
, glib
+
, json-glib
+
, gnutls
+
, gpgme
+
, gobject-introspection
+
, vala
+
, help2man
+
, gtk-doc
+
, meson
+
, ninja
+
, pkg-config
+
, python3
+
, nixosTests
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "libjcat";
+
version = "0.1.1";
+
+
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
+
+
src = fetchFromGitHub {
+
owner = "hughsie";
+
repo = "libjcat";
+
rev = version;
+
sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0=";
+
};
+
+
patches = [
+
# Installed tests are installed to different output
+
./installed-tests-path.patch
+
+
# Fix version file generation
+
(fetchpatch {
+
url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch";
+
sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is=";
+
})
+
];
+
+
nativeBuildInputs = [
+
meson
+
ninja
+
pkg-config
+
docbook_xml_dtd_43
+
docbook-xsl-nons
+
gobject-introspection
+
vala
+
help2man
+
gtk-doc
+
(python3.withPackages (pkgs: with pkgs; [
+
setuptools
+
]))
+
];
+
+
buildInputs = [
+
glib
+
json-glib
+
gnutls
+
gpgme
+
];
+
+
mesonFlags = [
+
"-Dgtkdoc=true"
+
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
+
];
+
+
postPatch = ''
+
patchShebangs contrib/generate-version-script.py
+
'';
+
+
doCheck = true;
+
+
passthru = {
+
tests = {
+
installed-tests = nixosTests.installed-tests.libjcat;
+
};
+
};
+
+
meta = with stdenv.lib; {
+
description = "Library for reading and writing Jcat files";
+
homepage = "https://github.com/hughsie/libjcat";
+
license = licenses.lgpl21Plus;
+
maintainers = with maintainers; [ jtojnar ];
+
platforms = platforms.all;
+
};
+
}
+24
pkgs/development/libraries/libjcat/installed-tests-path.patch
···
···
+
diff --git a/meson.build b/meson.build
+
index f69968d..d1d6c6e 100644
+
--- a/meson.build
+
+++ b/meson.build
+
@@ -114,8 +114,8 @@ else
+
datadir = join_paths(prefix, get_option('datadir'))
+
localstatedir = join_paths(prefix, get_option('localstatedir'))
+
libexecdir = join_paths(prefix, get_option('libexecdir'))
+
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
+
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
+
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
+
endif
+
mandir = join_paths(prefix, get_option('mandir'))
+
localedir = join_paths(prefix, get_option('localedir'))
+
diff --git a/meson_options.txt b/meson_options.txt
+
index 4784300..d382fc1 100644
+
--- a/meson_options.txt
+
+++ b/meson_options.txt
+
@@ -1,3 +1,4 @@
+
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
+
option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation')
+
option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
+
option('tests', type : 'boolean', value : true, description : 'enable tests')
+2
pkgs/top-level/all-packages.nix
···
libiptcdata = callPackage ../development/libraries/libiptcdata { };
libjpeg_original = callPackage ../development/libraries/libjpeg { };
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
···
libiptcdata = callPackage ../development/libraries/libiptcdata { };
+
libjcat = callPackage ../development/libraries/libjcat { };
+
libjpeg_original = callPackage ../development/libraries/libjpeg { };
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };