diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-02T20·21+0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-02T20·21+0000 |
| commit | f3cf0436b520918e061bf91efef3bb19b99bf726 (patch) | |
| tree | 2fcc110345e203fdac52f949a8decc7d3cb2af36 | |
| parent | 0202ce6b94f287f70a6723473c73a4c7f135dae4 (diff) | |
Install bsdiff and bspatch in $(libexecdir)/nix
| -rw-r--r-- | perl/lib/Nix/GeneratePatches.pm | 2 | ||||
| -rwxr-xr-x | scripts/download-using-manifests.pl.in | 2 | ||||
| -rw-r--r-- | 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 f9d83c49c856..612c8a3a15ba 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 9d4b89bac9a2..b670163038e1 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 a56f6c124db0..c0d74e0ca4fd 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/* |