From f3cf0436b520918e061bf91efef3bb19b99bf726 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Dec 2013 20:21:31 +0000
Subject: [PATCH] Install bsdiff and bspatch in $(libexecdir)/nix

---
 perl/lib/Nix/GeneratePatches.pm        | 2 +-
 scripts/download-using-manifests.pl.in | 2 +-
 src/bsdiff-4.3/Makefile                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/perl/lib/Nix/GeneratePatches.pm b/perl/lib/Nix/GeneratePatches.pm
index f9d83c49c..612c8a3a1 100644
--- a/perl/lib/Nix/GeneratePatches.pm
+++ b/perl/lib/Nix/GeneratePatches.pm
@@ -225,7 +225,7 @@ sub generatePatches {
             }
         
             my $time1 = time();
-            my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF");
+            my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/nix/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF");
             my $time2 = time();
             if ($res) {
                 warn "binary diff computation aborted after ", $time2 - $time1, " seconds\n";
diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in
index 9d4b89bac..b67016303 100755
--- a/scripts/download-using-manifests.pl.in
+++ b/scripts/download-using-manifests.pl.in
@@ -317,7 +317,7 @@ while (scalar @path > 0) {
         # Apply the patch to the NAR archive produced in step 1 (for
         # the already present path) or a later step (for patch sequences).
         print STDERR "  applying patch...\n";
-        system("$Nix::Config::libexecDir/bspatch $tmpNar $tmpNar2 $patchPath") == 0
+        system("$Nix::Config::libexecDir/nix/bspatch $tmpNar $tmpNar2 $patchPath") == 0
             or die "cannot apply patch `$patchPath' to $tmpNar\n";
 
         if ($curStep < $maxStep) {
diff --git a/src/bsdiff-4.3/Makefile b/src/bsdiff-4.3/Makefile
index a56f6c124..c0d74e0ca 100644
--- a/src/bsdiff-4.3/Makefile
+++ b/src/bsdiff-4.3/Makefile
@@ -3,11 +3,11 @@ PROGRAMS += bsdiff bspatch
 bsdiff_DIR := $(d)
 bsdiff_SOURCES = bsdiff.c
 bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include)
-bsdiff_INSTALL_DIR = $(libexecdir)
+bsdiff_INSTALL_DIR = $(libexecdir)/nix
 
 bspatch_DIR := $(d)
 bspatch_SOURCES = bspatch.c
 bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
-bspatch_INSTALL_DIR = $(libexecdir)
+bspatch_INSTALL_DIR = $(libexecdir)/nix
 
 dist_files += $(d)/compat-include/*