b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gsmartcontrol: 1.1.3 -> 1.1.4

Browse source
This commit is contained in:
gbtb 2023-01-01 19:29:42 +10:00
parent e989ef9671
commit 2dedd1b743
2 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/misc/gsmartcontrol/default.nix
View file

@ -1,18 +1,22 @@
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: { fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version="1.1.3";
pname = "gsmartcontrol"; pname = "gsmartcontrol";
version = "1.1.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; url = "https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/gsmartcontrol-${version}.tar.bz2";
sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn"; sha256 = "sha256-/ECfK4qEzEC7ED1sgkAbnUwBgtWjsiPJOVnHrWYZGEc=";
}; };
patches = [ patches = [
./fix-paths.patch ./fix-paths.patch
]; ];
postPatch = ''
substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin
'';
nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ];
buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ];
@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
It allows you to inspect the drive's SMART data to determine its health, It allows you to inspect the drive's SMART data to determine its health,
as well as run various tests on it. as well as run various tests on it.
''; '';
homepage = "https://gsmartcontrol.sourceforge.io/"; homepage = "https://gsmartcontrol.shaduri.dev/";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [qknight]; maintainers = with lib.maintainers; [qknight];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;

25
pkgs/tools/misc/gsmartcontrol/fix-paths.patch
View file

@ -1,14 +1,3 @@
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 diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
--- a/data/gsmartcontrol-root.in --- a/data/gsmartcontrol-root.in
+++ b/data/gsmartcontrol-root.in +++ b/data/gsmartcontrol-root.in
@ -30,20 +19,6 @@ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
export PATH="$EXTRA_PATHS:$PATH" 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 diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am