public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #774 from aristidb/master

Browse Source 
Add nvidia-smi tool and fix an embarrassing bug in a previous pull request of mine
This commit is contained in:
Bjørn Forsman 2013-07-21 13:53:19 -07:00
commit 2f41fbad51
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
cd tools/perf cd tools/perf
sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-f bash_completion && sed -i 's,^have perf,_have perf,' bash_completion [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
export makeFlags="DESTDIR=$out $makeFlags" export makeFlags="DESTDIR=$out $makeFlags"
''; '';

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -74,7 +74,7 @@ installPhase() {
# Install the programs. # Install the programs.
mkdir -p $out/bin mkdir -p $out/bin
for i in nvidia-settings nvidia-xconfig; do for i in nvidia-settings nvidia-smi nvidia-xconfig; do
cp $i $out/bin/$i cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i --set-rpath $out/lib:$programPath:$glPath $out/bin/$i