Skip to content

Commit f68f849

Browse files
committed
racket: restore static libraries
Close #379188.
1 parent ef16997 commit f68f849

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

pkgs/development/interpreters/racket/minimal.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
let
2020
manifest = lib.importJSON ./manifest.json;
2121

22-
inherit (stdenv.hostPlatform) isDarwin isStatic;
22+
inherit (stdenv.hostPlatform) isDarwin;
2323
in
2424

2525
stdenv.mkDerivation (finalAttrs: {
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
7676
"--enable-libz"
7777
]
7878
++ lib.optional disableDocs "--disable-docs"
79-
++ lib.optionals (!isStatic) [
79+
++ lib.optionals (!(finalAttrs.dontDisableStatic or false)) [
8080
# instead of `--disable-static` that `stdenv` assumes
8181
"--disable-libs"
8282
# "not currently supported" in `configure --help-cs` but still emphasized in README
@@ -88,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
8888
"--enable-xonx"
8989
];
9090

91+
# The upstream script builds static libraries by default.
92+
dontAddStaticConfigureFlags = true;
93+
9194
dontStrip = isDarwin;
9295

9396
postFixup =

pkgs/top-level/all-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7240,7 +7240,9 @@ with pkgs;
72407240
wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
72417241

72427242
racket = callPackage ../development/interpreters/racket { };
7243-
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
7243+
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix {
7244+
stdenv = stdenvAdapters.makeStaticLibraries stdenv;
7245+
};
72447246

72457247
rakudo = callPackage ../development/interpreters/rakudo { };
72467248
moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {

0 commit comments

Comments
 (0)