rmlint: fix build without patch

This commit is contained in:
Jörg Thalheim 2018-12-23 22:41:09 +01:00
parent 3b2506b048
commit e7ad1fb977
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
2 changed files with 9 additions and 24 deletions

View file

@ -1,18 +0,0 @@
# 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

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, { stdenv, fetchFromGitHub
gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: , gettext, pkgconfig, scons
, glib, json-glib, libelf, sphinx, utillinux }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,13 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz";
}; };
CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
patches = [ nativeBuildInputs = [
./blkid-hack.patch pkgconfig sphinx gettext scons
]; ];
nativeBuildInputs = [ pkgconfig sphinx ]; buildInputs = [
buildInputs = [ gettext glib json-glib libelf scons utillinux ]; glib json-glib libelf utillinux
];
prefixKey = "--prefix="; prefixKey = "--prefix=";