diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch')
| -rw-r--r-- | nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch b/nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch new file mode 100644 index 000000000000..c94186577031 --- /dev/null +++ b/nixpkgs/pkgs/by-name/li/likwid/cat-grep-sort-wc.patch @@ -0,0 +1,20 @@ +--- a/src/access-daemon/accessDaemon.c 2024-01-10 14:26:18.519538418 +0100 ++++ b/src/access-daemon/accessDaemon.c 2024-01-10 14:30:44.090278291 +0100 +@@ -201,7 +201,7 @@ + static int getNumberOfCPUs() + { + FILE* fpipe = NULL; +- char cmd[1024] = "cat /proc/cpuinfo | grep \"processor\" | sort -u | wc -l"; ++ char cmd[1024] = "@coreutils@cat /proc/cpuinfo | @gnugrep@grep \"processor\" | @coreutils@sort -u | @coreutils@wc -l"; + char buff[1024]; + if ( !(fpipe = popen(cmd,"r")) ) + { +@@ -219,7 +219,7 @@ + static int getNumberOfSockets() + { + FILE* fpipe = NULL; +- char cmd[1024] = "cat /proc/cpuinfo | grep \"physical id\" | sort -u | wc -l"; ++ char cmd[1024] = "@coreutils@cat /proc/cpuinfo | @gnugrep@grep \"physical id\" | @coreutils@sort -u | @coreutils@wc -l"; + char buff[1024]; + if ( !(fpipe = popen(cmd,"r")) ) + { |