summary refs log tree commit diff
path: root/pkgs/os-specific/linux/numatop
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-28 13:44:21 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-28 17:46:39 +0000
commitcab13e087c80c4e7476bb7df432e2b7deb56563d (patch)
treef8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/numatop
parentd9c82ed3044c72cecf01c6ea042489d30914577c (diff)
parent8ecc61c91a596df7d3293603a9c2384190c1b89a (diff)
downloadnixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts:
	pkgs/applications/graphics/hello-wayland/default.nix
	pkgs/applications/virtualization/cloud-hypervisor/default.nix
	pkgs/applications/window-managers/tinywl/default.nix
	pkgs/applications/window-managers/wayfire/applications.nix
	pkgs/applications/window-managers/wayfire/default.nix
	pkgs/applications/window-managers/wayfire/wcm.nix
	pkgs/applications/window-managers/wayfire/wf-config.nix
	pkgs/applications/window-managers/wayfire/wf-shell.nix
	pkgs/development/libraries/wlroots/default.nix
	pkgs/os-specific/linux/chromium-os/crosvm/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix
	pkgs/os-specific/linux/kernel/patches.nix
	pkgs/os-specific/linux/mdevd/default.nix
	pkgs/os-specific/linux/s6-linux-init/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/numatop')
-rw-r--r--pkgs/os-specific/linux/numatop/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix
index 57ee511bbad..ba972bb6916 100644
--- a/pkgs/os-specific/linux/numatop/default.nix
+++ b/pkgs/os-specific/linux/numatop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, numactl, ncurses, check }:
+{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }:
 
 stdenv.mkDerivation rec {
   pname = "numatop";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ numactl ncurses ];
   checkInputs = [ check ];
 
   doCheck  = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system";
     homepage = "https://01.org/numatop";
     license = licenses.bsd3;