about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2019-01-24 14:14:03 +0000
committerGitHub <noreply@github.com>2019-01-24 14:14:03 +0000
commitfbd7d43c39e0a498cf1c2c423b0014871634c784 (patch)
tree9feff4b8f3b7c152a94a9d015d8b6bd60b8621ce /pkgs/tools
parentbe89ca5564979200609025f7c2e56ed120bc0e00 (diff)
parente7ad1fb97770cee7189e86e3e40ae39afbac162a (diff)
downloadnixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar.gz
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar.bz2
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar.lz
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar.xz
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.tar.zst
nixlib-fbd7d43c39e0a498cf1c2c423b0014871634c784.zip
Merge pull request #52738 from bachp/rmlint-2.8.0
rmlint: 2.6.1 -> 2.8.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/rmlint/default.nix22
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 640e641dd477..320edd83021f 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchFromGitHub,
-  gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }:
+{ stdenv, fetchFromGitHub
+, gettext, pkgconfig, scons
+, glib, json-glib, libelf, sphinx, utillinux }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.6.1";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "rmlint";
     rev = "v${version}";
-    sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8";
+    sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz";
   };
 
-  configurePhase = "scons config";
+  CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ];
+  nativeBuildInputs = [
+    pkgconfig sphinx gettext scons
+  ];
 
-  buildPhase = "scons";
+  buildInputs = [
+    glib json-glib libelf utillinux
+  ];
 
-  installPhase = "scons --prefix=$out install";
+  prefixKey = "--prefix=";
 
   meta = {
     description = "Extremely fast tool to remove duplicates and other lint from your filesystem";