From 8dc06a23856292fc148d430b1cc88c723aa8b639 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 26 Aug 2017 18:35:40 +0200 Subject: [PATCH 1/2] racket: 6.9 -> 6.10 --- pkgs/development/interpreters/racket/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 245ff7b006f..79759eb6443 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.9"; + version = "6.10"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714"; + sha256 = "1mqnyj3bawad12dygsb11f2dbnkjp7q6d7ra714rqyw8mxix5ws0"; }; FONTCONFIG_FILE = fontsConf; @@ -52,8 +52,7 @@ stdenv.mkDerivation rec { cd src/build ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] + configureFlags = [ "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; From 5ae506e94a269a5092e019dbbd5197789a0ac3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 26 Aug 2017 20:12:07 +0100 Subject: [PATCH 2/2] racket: fix shared library build --- pkgs/development/interpreters/racket/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 79759eb6443..07f622931fa 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -47,12 +47,14 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; preConfigure = '' + unset AR substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname mkdir src/build cd src/build ''; - configureFlags = [ "--enable-lt=${libtool}/bin/libtool" ] + shared = if stdenv.isDarwin then "dylib" else "shared"; + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];