git.iko.soy/typeable/nixpkgs
on master help sign in
thermald: 2.2 -> 2.3

Also cleanup the derivation: - remove unnecessary PKG_CONFIG_PATH export - change gpl2 to gpl2Only - add meta.changelog - reformat inputs and sort alphabetically last three suggested by @drewrisinger.

commit5cae66cb841d3ba45a144c5b3c39c153476aea9b authorRouven Czerwinski <rouven@czerwinskis.de> dateTue 8 Sep 2020, 08:40 (6 years ago) parente0759a4
1 file changed+44−13
pkgs/tools/system/thermald/default.nix+44−13
pkgs/tools/system/thermald/default.nix+44−13
@@ -1,34 +1,64 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool
2−, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }:
1+{ autoconf
2+, autoconf-archive
3+, automake
4+, dbus
5+, dbus-glib
6+, docbook_xml_dtd_412
7+, docbook-xsl-nons
8+, fetchFromGitHub
9+, gtk-doc
10+, libevdev
11+, libtool
12+, libxml2
13+, lzma
14+, pkgconfig
15+, stdenv
16+, upower
17+}:
318
419stdenv.mkDerivation rec {
520 pname = "thermald";
6− version = "2.2";
21+ version = "2.3";
22+
23+ outputs = [ "out" "devdoc" ];
724
825 src = fetchFromGitHub {
926 owner = "intel";
1027 repo = "thermal_daemon";
1128 rev = "v${version}";
12− sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m";
29+ sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl";
1330 };
1431
15− nativeBuildInputs = [ pkgconfig ];
16− buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ];
17−
18− patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
32+ nativeBuildInputs = [
33+ autoconf
34+ autoconf-archive
35+ automake
36+ docbook-xsl-nons
37+ docbook_xml_dtd_412
38+ gtk-doc
39+ libtool
40+ pkgconfig
41+ ];
1942
20− preConfigure = ''
21− export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
22− ./autogen.sh
23− '';
43+ buildInputs = [
44+ dbus
45+ dbus-glib
46+ libevdev
47+ libxml2
48+ lzma
49+ upower
50+ ];
2451
2552 configureFlags = [
2653 "--sysconfdir=${placeholder "out"}/etc"
2754 "--localstatedir=/var"
55+ "--enable-gtk-doc"
2856 "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
2957 "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
3058 ];
3159
60+ preConfigure = "NO_CONFIGURE=1 ./autogen.sh";
61+
3262 postInstall = ''
3363 cp ./data/thermal-conf.xml $out/etc/thermald/
3464 '';
@@ -36,7 +66,8 @@ stdenv.mkDerivation rec {
3666 meta = with stdenv.lib; {
3767 description = "Thermal Daemon";
3868 homepage = "https://01.org/linux-thermal-daemon";
39− license = licenses.gpl2;
69+ changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt";
70+ license = licenses.gpl2Plus;
4071 platforms = [ "x86_64-linux" "i686-linux" ];
4172 maintainers = with maintainers; [ abbradar ];
4273 };