public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gerbil: 0.13 -> 0.14

Browse Source
This commit is contained in:
Francois-Rene Rideau 2018-11-19 09:14:15 -05:00
parent 7ffdb45101
commit f87b172891
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/gerbil/build.nix
View File

@ -1,20 +1,20 @@
{ stdenv, makeStaticLibraries, { stdenv, makeStaticLibraries,
coreutils, rsync, bash, coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, 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: distinct packages for gerbil-release and gerbil-devel
# TODO: make static compilation work # TODO: make static compilation work
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gerbil-${version}"; name = "gerbil-${version}";
src = SRC; inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries # Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
buildInputs = [ GAMBIT coreutils rsync bash ] buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries; ++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
@ -66,9 +66,9 @@ EOF
export GERBIL_HOME=$out export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then 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 else
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi fi
EOF EOF
runHook postInstall runHook postInstall

18
pkgs/development/compilers/gerbil/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, callPackage, fetchurl, gambit }: { stdenv, callPackage, fetchFromGitHub, gambit }:
callPackage ./build.nix { callPackage ./build.nix rec {
version = "0.13"; version = "0.14";
git-version = "0.13"; git-version = "0.14";
GAMBIT = gambit; inherit gambit;
SRC = fetchurl { src = fetchFromGitHub {
url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz"; owner = "vyzo";
sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l"; repo = "gerbil";
rev = "v${version}";
sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
}; };
inherit stdenv; inherit stdenv;
} }