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
37
pkgs/development/libraries/libcryptui/default.nix
Normal file
37
pkgs/development/libraries/libcryptui/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome, gtk3, gnupg, gpgme, dbus-glib, libgnome-keyring }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcryptui";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch
|
||||
# https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1
|
||||
./fix-latest-gnupg.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool autoreconfHook ];
|
||||
buildInputs = [ glib gtk3 gnupg gpgme dbus-glib libgnome-keyring ];
|
||||
propagatedBuildInputs = [ dbus-glib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interface components for OpenPGP";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libcryptui";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
26
pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
Normal file
26
pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@gnome.org>
|
||||
Date: Fri, 10 Nov 2017 08:55:55 +0100
|
||||
Subject: [PATCH] Accept GnuPG 2.2.x as supported version
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=790152
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4486e7b2..be5b28b4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
|
||||
DO_CHECK=$enableval, DO_CHECK=yes)
|
||||
|
||||
if test "$DO_CHECK" = "yes"; then
|
||||
- accepted_versions="1.2 1.4 2.0"
|
||||
+ accepted_versions="1.2 1.4 2.0 2.2 2.3"
|
||||
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue