diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/default.nix | 2 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/default.nix index 2e235e27f364..6d2d8eb75b00 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/default.nix @@ -12,6 +12,8 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ python-wifi ]; + patches = [ ./fix_pluginpath.patch ]; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch new file mode 100644 index 000000000000..06d7793da47e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch @@ -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: |