uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
77
pkgs/development/libraries/libjcat/default.nix
Normal file
77
pkgs/development/libraries/libjcat/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, docbook_xml_dtd_43
|
||||
, docbook-xsl-nons
|
||||
, glib
|
||||
, json-glib
|
||||
, gnutls
|
||||
, gpgme
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, gtk-doc
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjcat";
|
||||
version = "0.1.11";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = version;
|
||||
sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Installed tests are installed to different output
|
||||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
docbook_xml_dtd_43
|
||||
docbook-xsl-nons
|
||||
gobject-introspection
|
||||
vala
|
||||
gtk-doc
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
json-glib
|
||||
gnutls
|
||||
gpgme
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtkdoc=true"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
installed-tests = nixosTests.installed-tests.libjcat;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with 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;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
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')
|
||||
Loading…
Add table
Add a link
Reference in a new issue