mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
gerbil: 0.13 -> 0.14
This commit is contained in:
parent
7ffdb45101
commit
f87b172891
@ -1,20 +1,20 @@
|
||||
{ stdenv, makeStaticLibraries,
|
||||
coreutils, rsync, bash,
|
||||
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
|
||||
version, git-version, GAMBIT, SRC }:
|
||||
version, git-version, gambit, src }:
|
||||
|
||||
# TODO: distinct packages for gerbil-release and gerbil-devel
|
||||
# TODO: make static compilation work
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gerbil-${version}";
|
||||
src = SRC;
|
||||
inherit src;
|
||||
|
||||
# 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 = [ gambit rsync bash ]
|
||||
++ buildInputs_libraries ++ buildInputs_staticLibraries;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
|
||||
@ -66,9 +66,9 @@ EOF
|
||||
export GERBIL_HOME=$out
|
||||
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
|
||||
if [[ \$# = 0 ]] ; then
|
||||
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
|
||||
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
|
||||
else
|
||||
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
|
||||
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
|
||||
fi
|
||||
EOF
|
||||
runHook postInstall
|
||||
|
@ -1,12 +1,14 @@
|
||||
{ stdenv, callPackage, fetchurl, gambit }:
|
||||
{ stdenv, callPackage, fetchFromGitHub, gambit }:
|
||||
|
||||
callPackage ./build.nix {
|
||||
version = "0.13";
|
||||
git-version = "0.13";
|
||||
GAMBIT = gambit;
|
||||
SRC = fetchurl {
|
||||
url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz";
|
||||
sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l";
|
||||
callPackage ./build.nix rec {
|
||||
version = "0.14";
|
||||
git-version = "0.14";
|
||||
inherit gambit;
|
||||
src = fetchFromGitHub {
|
||||
owner = "vyzo";
|
||||
repo = "gerbil";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
|
||||
};
|
||||
inherit stdenv;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user