mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
Merge branch 'staging-next' into staging
This commit is contained in:
commit
1465e8e397
45 changed files with 3069 additions and 1050 deletions
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
, sysctl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -33,6 +35,13 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# On Darwin sysctl is used to read CPU information.
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cpuinfo/cpuinfo.py \
|
||||
--replace "len(_program_paths('sysctl')) > 0" "True" \
|
||||
--replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Get CPU info with pure Python 2 & 3";
|
||||
longDescription = ''
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue