From 6dbffd5c9bb3e26a5aafbc7b8652d487a705c9f2 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Mon, 18 Nov 2024 10:03:23 -0500 Subject: [PATCH 1/2] fix: Use dynamic ruby even in static variants --- flake.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index fef4206..9341f5f 100644 --- a/flake.nix +++ b/flake.nix @@ -40,18 +40,7 @@ }); musl = (final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl { - # Fix the following Ruby cross build error: - # - # error: output '/nix/store/6hyyk9wnnxpd5rsr6ivc0s8l1lgvsjrb-ruby-x86_64-unknown-linux-musl-3.3.4' - # is not allowed to refer to the following paths: - # /nix/store/c77wdd4fb0llq37bpmfr73m7s7r1j068-ruby-3.3.4 - # - # See https://github.com/NixOS/nixpkgs/issues/347758 - ruby = prev.ruby.overrideAttrs (old: { - postInstall = old.postInstall + '' - find $out/${old.passthru.gemPath} -name exts.mk -delete - ''; - }); + ruby = prev.pkgsBuildBuild.ruby; # Tests on static postgresql are failing with: # From 630fb539ff7480fed260539d8a425e6560c6cbc7 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Wed, 20 Nov 2024 09:30:48 -0500 Subject: [PATCH 2/2] doc: Explain why we're using dynamic ruby --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 9341f5f..3da2430 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,8 @@ }); musl = (final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl { + # We don't need a ruby static build. We're only interested in producing static + # outputs, not necessarily build tools. ruby = prev.pkgsBuildBuild.ruby; # Tests on static postgresql are failing with: