diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 9bd23aebfc43..f67582385e6f 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, fetchgit, gambit, +{ stdenv, lib, fetchurl, fetchgit, makeStaticLibraries, gambit, coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }: + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql }: # TODO: distinct packages for gerbil-release and gerbil-devel +# TODO: make static compilation work stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.12-DEV-1030-gbbed3bc"; + version = "0.12-DEV-1404-g0a266db"; src = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928"; - sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r"; + rev = "0a266db5e2e241272711bc150cc2607204bf2b78"; + sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m"; }; - buildInputs = [ - gambit - coreutils rsync bash - openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb - ]; + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; + buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit coreutils rsync bash ] + ++ buildInputs_libraries ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; @@ -30,6 +32,18 @@ stdenv.mkDerivation rec { find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' done + + cat > etc/gerbil_static_libraries.sh <