Merge pull request #16276 from manveru/gemconfig-rbnacl

gemconfig: rbnacl needs libsodium
This commit is contained in:
Joachim F 2016-09-05 01:11:57 +02:00 committed by GitHub
commit 01811fe2cd

View File

@ -21,7 +21,7 @@
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
, libmsgpack, qt48 , libmsgpack, qt48, libsodium
}: }:
let let
@ -129,6 +129,14 @@ in
buildInputs = [ openssl ]; buildInputs = [ openssl ];
}; };
rbnacl = spec: {
postInstall = ''
sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \
RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium.${if stdenv.isDarwin then "dylib" else "so"}'
"
'';
};
rmagick = attrs: { rmagick = attrs: {
buildInputs = [ imagemagick pkgconfig which ]; buildInputs = [ imagemagick pkgconfig which ];
}; };