From a78a509fbae77fe83344745e92b9d47c66c49896 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 31 Jan 2021 10:50:16 +0800 Subject: [PATCH] hddtemp: put the drive database where we expect it --- pkgs/tools/misc/hddtemp/default.nix | 32 +++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index de57b253990..3939d60144d 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -1,32 +1,38 @@ { lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "hddtemp-0.3_beta15"; - - db = fetchurl{ +let + db = fetchurl { url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; +in +stdenv.mkDerivation rec { + pname = "hddtemp"; + version = "0.3-beta15"; + src = fetchurl { - url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; - sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; + url = "mirror://savannah/hddtemp/hddtemp-${version}.tar.bz2"; + sha256 = "sha256-YYVBWEBUCT1TvootnoHJcXTzDwCvkcuHAKl+RC1571s="; }; # from Gentoo patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ]; - configurePhase = - '' - mkdir -p $out/nix-support - cp $db $out/nix-support/hddtemp.db - ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db - ''; + configureFlags = [ + "--with-db-path=${placeholder "out"}/share/${pname}/hddtemp.db" + ]; + + postInstall = '' + install -Dm444 ${db} $out/share/${pname}/hddtemp.db + ''; + + enableParallelBuilding = true; meta = with lib; { description = "Tool for displaying hard disk temperature"; homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; }