diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-23 22:41:09 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-23 22:41:09 +0100 |
| commit | e7ad1fb97770cee7189e86e3e40ae39afbac162a (patch) | |
| tree | b4cbe0a696b5f25b7a740011402cf379c6151569 /pkgs/tools/misc/rmlint | |
| parent | 3b2506b04857a5bfc825a46f5ee15d0132056e65 (diff) | |
| download | nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar.gz nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar.bz2 nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar.lz nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar.xz nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.tar.zst nixpkgs-e7ad1fb97770cee7189e86e3e40ae39afbac162a.zip | |
rmlint: fix build without patch
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, 9 insertions, 24 deletions
diff --git a/pkgs/tools/misc/rmlint/blkid-hack.patch b/pkgs/tools/misc/rmlint/blkid-hack.patch deleted file mode 100644 index d712f7daa27..00000000000 --- a/pkgs/tools/misc/rmlint/blkid-hack.patch +++ /dev/null @@ -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 diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index b97c4ac13f7..320edd83021 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,6 @@ -{ 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 { @@ -13,13 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; }; + CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; - patches = [ - ./blkid-hack.patch + nativeBuildInputs = [ + pkgconfig sphinx gettext scons ]; - nativeBuildInputs = [ pkgconfig sphinx ]; - buildInputs = [ gettext glib json-glib libelf scons utillinux ]; + buildInputs = [ + glib json-glib libelf utillinux + ]; prefixKey = "--prefix="; |