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:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,126 @@
{ lib, stdenv
, fetchurl
, at-spi2-core
, babl
, dbus
, desktop-file-utils
, dleyna-renderer
, gdk-pixbuf
, gegl
, geocode-glib
, gettext
, gexiv2
, gfbgraph
, glib
, gnome-online-accounts
, gnome
, gobject-introspection
, grilo
, grilo-plugins
, gsettings-desktop-schemas
, gtk3
, itstool
, libdazzle
, libhandy
, libgdata
, libxml2
, meson
, ninja
, nixosTests
, pkg-config
, python3
, tracker
, tracker-miners
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "gnome-photos";
version = "42.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE=";
};
patches = [
./installed-tests-path.patch
];
nativeBuildInputs = [
desktop-file-utils
gettext
gobject-introspection # for setup hook
glib # for setup hook
itstool
libxml2
meson
ninja
pkg-config
(python3.withPackages (pkgs: with pkgs; [
dogtail
pygobject3
pyatspi
]))
wrapGAppsHook
];
buildInputs = [
babl
dbus
dleyna-renderer
gdk-pixbuf
gegl
geocode-glib
gexiv2
gfbgraph
glib
gnome-online-accounts
grilo
grilo-plugins
gsettings-desktop-schemas
gtk3
libdazzle
libhandy
libgdata
tracker
tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
at-spi2-core # for tests
];
mesonFlags = [
"-Dinstalled_tests=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
patchShebangs tests/basic.py
'';
postFixup = ''
wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
};
tests = {
installed-tests = nixosTests.installed-tests.gnome-photos;
};
};
meta = with lib; {
description = "Access, organize and share your photos";
homepage = "https://wiki.gnome.org/Apps/Photos";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,23 @@
diff --git a/meson.build b/meson.build
index dee932dc..f8851913 100644
--- a/meson.build
+++ b/meson.build
@@ -16,8 +16,8 @@
photos_docdir = join_paths(photos_datadir, 'doc', meson.project_name())
photos_libdir = join_paths(photos_prefix, get_option('libdir'), meson.project_name())
-photos_installed_test_metadir = join_paths(photos_datadir, 'installed-tests', meson.project_name())
-photos_installed_test_execdir = join_paths(photos_libexecdir, 'installed-tests', meson.project_name())
+photos_installed_test_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
+photos_installed_test_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
photos_namespace = 'org.gnome.Photos'
diff --git a/meson_options.txt b/meson_options.txt
index f34b5cc0..8e09970b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,3 @@
option('dogtail', type: 'boolean', value: true, description: 'test using dogtail')
option('installed_tests', type: 'boolean', value: false, description: 'Enable installation of some test cases')
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')