diff options
Diffstat (limited to 'pkgs/tools/misc/findutils')
| -rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/findutils/no-install-statedir.patch | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index f1090bcf457f4..53d75485d5ca3 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; }; - patches = [ ./memory-leak.patch ]; + patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; + configureFlags = [ "--localstatedir=/var/cache" ]; + crossAttrs = { # Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :( propagatedBuildInputs = [ ]; diff --git a/pkgs/tools/misc/findutils/no-install-statedir.patch b/pkgs/tools/misc/findutils/no-install-statedir.patch new file mode 100644 index 0000000000000..a7a48038a3aa0 --- /dev/null +++ b/pkgs/tools/misc/findutils/no-install-statedir.patch @@ -0,0 +1,11 @@ +--- a/locate/Makefile.in ++++ b/locate/Makefile.in +@@ -2357,7 +2357,7 @@ updatedb: updatedb.sh Makefile + chmod +x $@ + + install-data-hook: +- $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir) ++ #$(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir) + + dblocation.texi: + echo '@set LOCATE_DB $(LOCATE_DB)' > $@.tmp |