mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge pull request #35052 from fare-patches/master
gambit, gerbil: Monthly update
This commit is contained in:
commit
635ae6d292
@ -1,19 +1,20 @@
|
||||
{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }:
|
||||
{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs, makeStaticLibraries }:
|
||||
|
||||
# TODO: distinct packages for gambit-release and gambit-devel
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gambit-${version}";
|
||||
version = "4.8.8-427-g37b111a5";
|
||||
version = "4.8.8-435-gd1991ba7";
|
||||
bootstrap = import ./bootstrap.nix ( pkgs );
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/feeley/gambit.git";
|
||||
rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24";
|
||||
sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50";
|
||||
rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0";
|
||||
sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl git autoconf bootstrap ];
|
||||
# Use makeStaticLibraries to enable creation of statically linked binaries
|
||||
buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)];
|
||||
|
||||
configurePhase = ''
|
||||
options=(
|
||||
|
@ -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 <<EOF
|
||||
#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
|
||||
#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING!
|
||||
ZLIB=${makeStaticLibraries zlib}/lib/libz.a
|
||||
# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
|
||||
# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
|
||||
# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
|
||||
MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
|
||||
# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
|
||||
LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
Loading…
Reference in New Issue
Block a user