diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-07-29 00:02:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 00:02:54 +0200 |
commit | 5424be125e68a0692221441abca08530156d66fc (patch) | |
tree | 9153eee0cf8db2c3df5e0d782ee9f26a32c2b942 /pkgs | |
parent | fb525f4486a80ba1aefa9c3a23f33ba366c244a7 (diff) | |
parent | 8a91213fd64c1f8ddf88d7f656eae2b20aa08be5 (diff) | |
download | nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar.gz nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar.bz2 nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar.lz nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar.xz nixpkgs-5424be125e68a0692221441abca08530156d66fc.tar.zst nixpkgs-5424be125e68a0692221441abca08530156d66fc.zip |
Merge pull request #131871 from fpletz/pkgs/powertop-2.14
powertop: 2.13 -> 2.14
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index bbcf6e390f0..79594a87c51 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +, pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { pname = "powertop"; - version = "2.13"; + version = "2.14"; - src = fetchurl { - url = "https://01.org/sites/default/files/downloads/${pname}-${version}.tar.gz"; - sha256 = "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6"; + src = fetchFromGitHub { + owner = "fenrus75"; + repo = pname; + rev = "v${version}"; + sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; }; outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; patches = lib.optional stdenv.hostPlatform.isMusl ( @@ -22,6 +25,8 @@ stdenv.mkDerivation rec { } ); + NIX_LDFLAGS = [ "-lpthread" ]; + postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" |