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,43 @@
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }:
stdenv.mkDerivation rec {
version="1.1.3";
pname = "gsmartcontrol";
src = fetchurl {
url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn";
};
patches = [
./fix-paths.patch
];
nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ];
buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ];
enableParallelBuilding = true;
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ smartmontools ]}"
)
'';
meta = {
description = "Hard disk drive health inspection tool";
longDescription = ''
GSmartControl is a graphical user interface for smartctl (from
smartmontools package), which is a tool for querying and controlling
SMART (Self-Monitoring, Analysis, and Reporting Technology) data on
modern hard disk drives.
It allows you to inspect the drive's SMART data to determine its health,
as well as run various tests on it.
'';
homepage = "https://gsmartcontrol.sourceforge.io/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [qknight];
platforms = with lib.platforms; linux;
};
}

View file

@ -0,0 +1,58 @@
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -475,6 +475,7 @@
AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
+ data/org.gsmartcontrol.policy \
data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
debian.dist/changelog \
src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
--- a/data/gsmartcontrol-root.in
+++ b/data/gsmartcontrol-root.in
@@ -8,7 +8,7 @@
# Run gsmartcontrol with root, asking for root password first.
# export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c").
-EXEC_BIN="@prefix@/sbin/gsmartcontrol";
+EXEC_BIN="@prefix@/bin/gsmartcontrol";
prog_name="gsmartcontrol"
@@ -118,7 +118,7 @@
# Add @prefix@/sbin as well (freebsd seems to require it).
# Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin,
# so add it first as well.
-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin";
+EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin";
export PATH="$EXTRA_PATHS:$PATH"
diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in
rename from data/org.gsmartcontrol.policy
rename to data/org.gsmartcontrol.policy.in
--- a/data/org.gsmartcontrol.policy
+++ b/data/org.gsmartcontrol.policy.in
@@ -12,7 +12,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# endif
-sbin_PROGRAMS = gsmartcontrol
+bin_PROGRAMS = gsmartcontrol
gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \
$(top_builddir)/src/libdebug/libdebug.a \