nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80151 from ju1m/dstat_fix_pluginpath

Browse Source 
dstat: fix pluginpath
This commit is contained in:
Benjamin Hipple 2020-10-25 10:48:54 -04:00 committed by GitHub
commit d53dd036d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/dstat/default.nix
View File

@ -12,6 +12,8 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages; [ python-wifi ]; propagatedBuildInputs = with python2Packages; [ python-wifi ];
patches = [ ./fix_pluginpath.patch ];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

15
pkgs/os-specific/linux/dstat/fix_pluginpath.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/dstat b/dstat
index 3ac7087..c5f089d 100755
--- a/dstat
+++ b/dstat
@@ -66,9 +66,7 @@ if sys.version_info < (2, 3):
pluginpath = [
os.path.expanduser('~/.dstat/'), # home + /.dstat/
- os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/', # binary path + /plugins/
- '/usr/share/dstat/',
- '/usr/local/share/dstat/',
+ os.path.abspath(os.path.dirname(sys.argv[0])) + '/../share/dstat/', # binary path + /../share/dstat/
]
class Options: