diff options
author | Austin Seipp <aseipp@pobox.com> | 2017-09-27 16:01:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 16:01:20 -0500 |
commit | 04d449aa7b99f90b603909b4f0e9f81f4097a155 (patch) | |
tree | 03b8734fcf0800ee17b37564026a9cb4cd0bb012 /pkgs | |
parent | 931da53e50401ef41f14911bc3af6f8287cfe7de (diff) | |
parent | 76245e0b9dc0f13af031bf9ed2057046a16fb98f (diff) | |
download | nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar.gz nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar.bz2 nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar.lz nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar.xz nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.tar.zst nixlib-04d449aa7b99f90b603909b4f0e9f81f4097a155.zip |
Merge pull request #29857 from peterbb/master
urweb: support darwin, depend on gcc, fix paths.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/urweb/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 7145a8f2fa04..bb8cb5f17461 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, file, openssl, mlton -, mysql, postgresql, sqlite +, mysql, postgresql, sqlite, gcc }: stdenv.mkDerivation rec { @@ -20,12 +20,14 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl.dev}"; preConfigure = '' - export PGHEADER="${postgresql}/include/libpq-fe.h"; + export PGHEADER="${postgresql.dev}/include/libpq-fe.h"; export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; + export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ - -L${lib.getLib mysql.client}/lib/mysql \ + -L${openssl.out}/lib \ + -L${lib.getLib mysql.client}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { description = "Advanced purely-functional web programming language"; homepage = "http://www.impredicative.com/ur/"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ]; }; } |