about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-11-16 14:20:47 +0000
committerGitHub <noreply@github.com>2018-11-16 14:20:47 +0000
commitd59307e54c63daf42d98288ba4c7132ccc02daf2 (patch)
tree370c63ba9d40f2b4eebbb2a5faa9c7dfc670723f
parentf805df3677df6a62d1dbb067c06fca6a0ec7d938 (diff)
parentd3c2ec6f1d9aa2500cf35eb2767306c250a0ed3a (diff)
downloadnixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar.gz
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar.bz2
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar.lz
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar.xz
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.tar.zst
nixlib-d59307e54c63daf42d98288ba4c7132ccc02daf2.zip
Merge pull request #35429 from clacke/racket-full-darwin
racket: on darwin, use libiconv
-rw-r--r--pkgs/development/interpreters/racket/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index ee7d9dd68136..ba66404062be 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -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" ];
   };
 }