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,84 @@
{ stdenv
, lib
, fetchurl
, substituteAll
, openfortivpn
, gettext
, pkg-config
, file
, glib
, gtk3
, gtk4
, networkmanager
, ppp
, libsecret
, withGnome ? true
, gnome
, libnma
, libnma-gtk4
}:
stdenv.mkDerivation rec {
pname = "NetworkManager-fortisslvpn";
version = "1.4.0";
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sFXiY0m1FrI1hXmKs+9XtDawFIAOkqiscyz8jnbF2vo=";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit openfortivpn;
})
];
nativeBuildInputs = [
gettext
pkg-config
file
];
buildInputs = [
openfortivpn
networkmanager
ppp
glib
] ++ lib.optionals withGnome [
gtk3
gtk4
libsecret
libnma
libnma-gtk4
];
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
"--with-gtk4=${if withGnome then "yes" else "no"}"
"--localstatedir=/var"
"--enable-absolute-paths"
];
installFlags = [
# the installer only creates an empty directory in localstatedir, so
# we can drop it
"localstatedir=."
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "networkmanager-fortisslvpn";
versionPolicy = "odd-unstable";
};
networkManagerPlugin = "VPN/nm-fortisslvpn-service.name";
};
meta = with lib; {
description = "NetworkManagers FortiSSL plugin";
inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,12 @@
diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c
index 6c340d0..995c981 100644
--- a/src/nm-fortisslvpn-service.c
+++ b/src/nm-fortisslvpn-service.c
@@ -182,6 +182,7 @@ nm_find_openfortivpn (void)
{
static const char *openfortivpn_binary_paths[] =
{
+ "@openfortivpn@/bin/openfortivpn",
"/usr/local/bin/openfortivpn",
"/usr/bin/openfortivpn",
NULL