lol

Merge pull request #118490 from corpix/fix/racket

racket: patching out runtime variant detection, fix #114993

authored by

Mario Rodas and committed by
GitHub
6b23e8fc 3c3998ee

+25 -4
+7 -4
pkgs/development/interpreters/racket/default.nix
··· 72 72 buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] 73 73 ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ]; 74 74 75 + patches = [ 76 + # Hardcode variant detection because we wrap the Racket binary making it 77 + # fail to detect its variant at runtime. 78 + # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 79 + ./force-cs-variant.patch 80 + ]; 81 + 75 82 preConfigure = '' 76 83 unset AR 77 84 for f in src/lt/configure src/cs/c/configure src/bc/src/string.c src/ChezScheme/workarea; do ··· 96 103 configureScript = "../configure"; 97 104 98 105 enableParallelBuilding = false; 99 - 100 - postFixup = lib.optionalString stdenv.isDarwin '' 101 - wrapProgram $out/bin/drracket --prefix DYLD_LIBRARY_PATH : ${xorg.libX11}/lib 102 - ''; 103 106 104 107 meta = with lib; { 105 108 description = "A programmable programming language";
+18
pkgs/development/interpreters/racket/force-cs-variant.patch
··· 1 + Hardcode Racket variant to CS 2 + 3 + Hardcode variant detection because nixpkgs wraps the Racket binary making it 4 + fail to detect its variant at runtime. 5 + https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 6 + 7 + --- old/collects/setup/variant.rkt 8 + +++ new/collects/setup/variant.rkt 9 + @@ -7,7 +7,8 @@ 10 + (provide variant-suffix 11 + script-variant?) 12 + 13 + -(define plain-variant 14 + +(define plain-variant 'cs) 15 + +#;(define plain-variant 16 + (delay/sync 17 + (cond 18 + [(cross-installation?)