diff options
author | Pascal Bach <pascal.bach@nextrem.ch> | 2018-12-23 21:43:28 +0100 |
---|---|---|
committer | Pascal Bach <pascal.bach@nextrem.ch> | 2018-12-23 21:43:28 +0100 |
commit | 3b2506b04857a5bfc825a46f5ee15d0132056e65 (patch) | |
tree | 7a3c1e62a0156458291c13f23304dc058a14ea76 /pkgs/tools/misc/rmlint | |
parent | 772759173d362a557a78ad58605579b417a9b08c (diff) |
rmlint: 2.6.1 -> 2.8.0
The recipe now uses the default scons build phases.
Diffstat (limited to 'pkgs/tools/misc/rmlint')
-rw-r--r-- | pkgs/tools/misc/rmlint/blkid-hack.patch | 18 | ||||
-rw-r--r-- | pkgs/tools/misc/rmlint/default.nix | 15 |
2 files changed, 26 insertions, 7 deletions
diff --git a/pkgs/tools/misc/rmlint/blkid-hack.patch b/pkgs/tools/misc/rmlint/blkid-hack.patch new file mode 100644 index 0000000000000..d712f7daa271d --- /dev/null +++ b/pkgs/tools/misc/rmlint/blkid-hack.patch @@ -0,0 +1,18 @@ +# HACK: For some reason the file blkid/blkid.h is not found during build. +# I assueme it is due to the fact that -I [...]util-linux-2.33-dev/include/blkid +# is added during the build and not just -I [...]util-linux-2.33-dev/include +# For the time being this patch is the only way I could find to fix the build. + +diff --git a/lib/utilities.c b/lib/utilities.c +index e768fa41..1f96fd68 100644 +--- a/lib/utilities.c ++++ b/lib/utilities.c +@@ -76,7 +76,7 @@ + #endif + + #if HAVE_BLKID +-#include <blkid/blkid.h> ++#include <blkid.h> + #endif + + #if HAVE_JSON_GLIB diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 640e641dd4772..b97c4ac13f703 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,23 +4,24 @@ 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"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; + patches = [ + ./blkid-hack.patch + ]; - buildPhase = "scons"; + nativeBuildInputs = [ pkgconfig sphinx ]; + buildInputs = [ gettext glib json-glib libelf scons utillinux ]; - installPhase = "scons --prefix=$out install"; + prefixKey = "--prefix="; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; |