diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2022-03-01 13:58:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 13:58:17 +0100 |
| commit | 47dec825c5daeeb9d615eb4d1eead3dbaa06c7c9 (patch) | |
| tree | 9d4426dfe847570906487649c32c5b320697705c /perl | |
| parent | 79152e307e7eef667c3de9c21571d017654a7c32 (diff) | |
| parent | dc92b01885c0c49d094148b1c4dc871ccdd265ad (diff) | |
Merge pull request #6181 from obsidiansystems/auto-uid-allocation
Auto uid allocation -- update with latest master
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/configure.ac | 2 | ||||
| -rw-r--r-- | perl/lib/Nix/Config.pm.in | 1 | ||||
| -rw-r--r-- | perl/lib/Nix/Store.xs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perl/configure.ac b/perl/configure.ac index eb65ac17b..a02cb06c9 100644 --- a/perl/configure.ac +++ b/perl/configure.ac @@ -41,7 +41,7 @@ perlarchname=$($perl -e 'use Config; print $Config{archname};') AC_SUBST(perllibdir, [${libdir}/perl5/site_perl/$perlversion/$perlarchname]) AC_MSG_RESULT($perllibdir) -# Look for libsodium, an optional dependency. +# Look for libsodium. PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"]) # Check for the required Perl dependencies (DBI and DBD::SQLite). diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in index f7c6f2484..508a15e15 100644 --- a/perl/lib/Nix/Config.pm.in +++ b/perl/lib/Nix/Config.pm.in @@ -1,6 +1,7 @@ package Nix::Config; use MIME::Base64; +use Nix::Store; $version = "@PACKAGE_VERSION@"; diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index edbf12f7c..54ad1680c 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -240,7 +240,7 @@ SV * convertHash(char * algo, char * s, int toBase32) PPCODE: try { auto h = Hash::parseAny(s, parseHashType(algo)); - string s = h.to_string(toBase32 ? Base32 : Base16, false); + auto s = h.to_string(toBase32 ? Base32 : Base16, false); XPUSHs(sv_2mortal(newSVpv(s.c_str(), 0))); } catch (Error & e) { croak("%s", e.what()); |