portable: make libiconv static (#2911)

pull/2915/head
patryk4815 8 months ago committed by GitHub
parent d264a075be
commit 076214357a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -80,10 +80,6 @@
# Disable patching trampoline # Disable patching trampoline
postPatch = ""; postPatch = "";
}); });
pwndbg_gdb = prev.pwndbg_gdb.override {
# Darwin version of libiconv causes issues with our portable build
libiconv = prev.pkgsStatic.libiconvReal;
};
}; };
pkgsBySystem = forAllSystems ( pkgsBySystem = forAllSystems (
system: system:
@ -95,6 +91,21 @@
pwndbg_lldb = prev.lldb_20; pwndbg_lldb = prev.lldb_20;
libffi_portable = null; libffi_portable = null;
}) })
(final: prev: {
# Dynamic libiconv causes issues with our portable build.
# It reads /some-path/lib/gconv/gconv-modules.d/gconv-modules-extra.conf,
# then loads /some-path/lib/gconv/UTF-32.so dynamically.
pwndbg_gdb =
let
libiconv = prev.pkgsStatic.libiconvReal;
in
(prev.pwndbg_gdb.override {
inherit libiconv;
}).overrideAttrs
(old: {
buildInputs = old.buildInputs ++ [ libiconv ];
});
})
( (
final: prev: final: prev:
nixpkgs.lib.optionalAttrs nixpkgs.lib.optionalAttrs

Loading…
Cancel
Save