Merge pull request #35429 from clacke/racket-full-darwin

racket: on darwin, use libiconv
This commit is contained in:
Jörg Thalheim 2018-11-16 14:20:47 +00:00 committed by GitHub
commit d59307e54c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,10 @@
{ stdenv, fetchurl, makeFontsConf, makeWrapper
, cairo, coreutils, fontconfig, freefont_ttf
, glib, gmp, gtk3, libedit, libffi, libjpeg
, glib, gmp
, gtk3
, libedit, libffi
, libiconv
, libjpeg
, libpng, libtool, mpfr, openssl, pango, poppler
, readline, sqlite
, disableDocs ? false
@ -56,7 +60,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
preConfigure = ''
unset AR
@ -98,6 +102,6 @@ stdenv.mkDerivation rec {
homepage = http://racket-lang.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ kkallio henrytill vrthra ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
}