From f21a491d3fe8970283c8a59062accb637583c9e1 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Sun, 4 Apr 2021 17:55:30 +0000 Subject: [PATCH] racket: patch the runtime variant detection Fixes #114993 --- .../interpreters/racket/default.nix | 11 +++++++---- .../interpreters/racket/force-cs-variant.patch | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/interpreters/racket/force-cs-variant.patch diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index c49c6b5b7c70..d64a78965008 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -72,6 +72,13 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ]; + patches = [ + # Hardcode variant detection because we wrap the Racket binary making it + # fail to detect its variant at runtime. + # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 + ./force-cs-variant.patch + ]; + preConfigure = '' unset AR for f in src/lt/configure src/cs/c/configure src/bc/src/string.c src/ChezScheme/workarea; do @@ -97,10 +104,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapProgram $out/bin/drracket --prefix DYLD_LIBRARY_PATH : ${xorg.libX11}/lib - ''; - meta = with lib; { description = "A programmable programming language"; longDescription = '' diff --git a/pkgs/development/interpreters/racket/force-cs-variant.patch b/pkgs/development/interpreters/racket/force-cs-variant.patch new file mode 100644 index 000000000000..6acbe5dc95d3 --- /dev/null +++ b/pkgs/development/interpreters/racket/force-cs-variant.patch @@ -0,0 +1,18 @@ +Hardcode Racket variant to CS + +Hardcode variant detection because nixpkgs wraps the Racket binary making it +fail to detect its variant at runtime. +https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 + +--- old/collects/setup/variant.rkt ++++ new/collects/setup/variant.rkt +@@ -7,7 +7,8 @@ + (provide variant-suffix + script-variant?) + +-(define plain-variant ++(define plain-variant 'cs) ++#;(define plain-variant + (delay/sync + (cond + [(cross-installation?)