Merge pull request #118490 from corpix/fix/racket

racket: patching out runtime variant detection, fix #114993

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 = ''

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?)