rmlint: 2.6.1 -> 2.8.0

The recipe now uses the default scons build phases.
This commit is contained in:
Pascal Bach 2018-12-23 21:43:28 +01:00
parent 772759173d
commit 3b2506b048
2 changed files with 26 additions and 7 deletions

View file

@ -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

View file

@ -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";