Merge branch 'master' into staging

2 files changed, 27 insertions, 0 deletions

diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
new file mode 100644
index 000000000000..e21da0deca2d
--- /dev/null
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }:
+
+stdenv.mkDerivation rec {
+  version = "0.15.2";
+  name = "scanmem-${version}";
+  src = fetchFromGitHub {
+    owner  = "scanmem";
+    repo   = "scanmem";
+    rev    = "v${version}";
+    sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094";
+  };
+  buildInputs = [ autoconf automake intltool libtool readline ];
+  preConfigure = ''
+    ./autogen.sh
+  '';
+  meta = {
+    homepage = "https://github.com/scanmem/scanmem";
+    description = "Memory scanner for finding and poking addresses in executing processes";
+    maintainers = [ stdenv.lib.maintainers.chattered  ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 4d3de16434b4..1e90ecfee328 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -51,6 +51,10 @@ in stdenv.mkDerivation {
     for i in $out/lib/udev/rules.d/*; do
       sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i"
     done
+
+    for i in man/*; do
+      install -D $i $out/share/man/man''${i##*.}/$(basename $i)
+    done
   '';
 
   passthru = { inherit enableRDW; };