diff options
author | Ryan Burns <rtburns@protonmail.com> | 2021-10-14 20:19:03 -0700 |
---|---|---|
committer | Ryan Burns <rtburns@protonmail.com> | 2021-10-14 20:20:09 -0700 |
commit | f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30 (patch) | |
tree | f4d2cd9e10b1c11f9a7481c438fd230ad1ad5e4d /pkgs/os-specific/linux/powertop/default.nix | |
parent | 16608ed2e65d4de4f6804c32ec4cbfbb05af2cd7 (diff) | |
download | nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar.gz nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar.bz2 nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar.lz nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar.xz nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.tar.zst nixpkgs-f317fb8796f1f19ee01c1b3ccbdee0c83ceb3b30.zip |
powertop: fix musl build
* remove obsolete musl patch (merged in https://github.com/fenrus75/powertop/commit/c2a52f912de3e0d9a368b999a027ad9d36c1b67a) * clarify license
Diffstat (limited to 'pkgs/os-specific/linux/powertop/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 79594a87c51..b8a0487bc7e 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { - name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; - sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; - } - ); - NIX_LDFLAGS = [ "-lpthread" ]; postPatch = '' @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; |