diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /perl/lib/Nix | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'perl/lib/Nix')
| -rw-r--r-- | perl/lib/Nix/Config.pm.in | 2 | ||||
| -rw-r--r-- | perl/lib/Nix/GeneratePatches.pm | 2 | ||||
| -rw-r--r-- | perl/lib/Nix/Store.xs | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in index 4f1f38ddd3a9..e07d4c08f13f 100644 --- a/perl/lib/Nix/Config.pm.in +++ b/perl/lib/Nix/Config.pm.in @@ -1,6 +1,6 @@ package Nix::Config; -$version = "@version@"; +$version = "@PACKAGE_VERSION@"; $binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@"; $libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@libexecdir@"; 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/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index d46af57e64f6..07ccebe62f51 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -35,6 +35,10 @@ MODULE = Nix::Store PACKAGE = Nix::Store PROTOTYPES: ENABLE +#undef dNOOP // Hack to work around "error: declaration of 'Perl___notused' has a different language linkage" error message on clang. +#define dNOOP + + void init() CODE: doInit(); |