From 3e0919668738d4a01be061fa4c132cbf54994e50 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 28 Jul 2025 06:03:30 +0000 Subject: [PATCH] dtrx: enable rpm; it builds on cross --- hosts/common/programs/dtrx.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hosts/common/programs/dtrx.nix b/hosts/common/programs/dtrx.nix index a5f5c91ae..7d70d65f3 100644 --- a/hosts/common/programs/dtrx.nix +++ b/hosts/common/programs/dtrx.nix @@ -5,19 +5,20 @@ # `binutils` is the nix wrapper, which reads nix-related env vars # before passing on to e.g. `ld`. # dtrx probably only needs `ar` at runtime, not even `ld`. + # this is a "correctness" (and closure) fix, not a build or even runtime fix (probably) binutils = pkgs.binutils-unwrapped; # build without rpm support, since `rpm` package doesn't cross-compile. - rpm = null; + # rpm = null; }).overrideAttrs (upstream: { - patches = (upstream.patches or []) ++ [ - (pkgs.fetchpatch2 { - # https://github.com/dtrx-py/dtrx/pull/62 - # this is needed for as long as i'm interacting with .tar.lz archives which are actually LZMA and not lzip. - name = "fix .tar.lz mapping"; - url = "https://github.com/dtrx-py/dtrx/commit/ff379f1444b142bb461f26780e32f82e60856be2.patch"; - hash = "sha256-WNz5i/iJqyxmZh/1mw6M8hWeiQdRvyhCta7gN/va6lQ="; - }) - ]; + # patches = (upstream.patches or []) ++ [ + # (pkgs.fetchpatch2 { + # # https://github.com/dtrx-py/dtrx/pull/62 + # # this is needed for as long as i'm interacting with .tar.lz archives which are actually LZMA and not lzip. + # name = "fix .tar.lz mapping"; + # url = "https://github.com/dtrx-py/dtrx/commit/ff379f1444b142bb461f26780e32f82e60856be2.patch"; + # hash = "sha256-WNz5i/iJqyxmZh/1mw6M8hWeiQdRvyhCta7gN/va6lQ="; + # }) + # ]; }); sandbox.whitelistPwd = true; sandbox.autodetectCliPaths = "existing"; #< for the archive