overlay: autoreconf some packages
Manually add the autoreconfHook to some packages that build only static libraries otherwise. Adding every library with this problem is not a practical solution but in the short term it is useful for finding other problems.
This commit is contained in:
parent
29dd6cf10d
commit
2b7111af5a
|
@ -19,6 +19,18 @@ let
|
||||||
overrideTargetAttrs drv
|
overrideTargetAttrs drv
|
||||||
(attrs: { patches = attrs.patches or [ ] ++ [ patch ]; });
|
(attrs: { patches = attrs.patches or [ ] ++ [ patch ]; });
|
||||||
|
|
||||||
|
nullForHost = pkg: if hostPlatform.isGenode then null else pkg;
|
||||||
|
|
||||||
|
reconfForHost = pkg:
|
||||||
|
if hostPlatform.isGenode then
|
||||||
|
pkg.overrideAttrs (attrs: {
|
||||||
|
nativeBuildInputs = attrs.nativeBuildInputs or [ ]
|
||||||
|
++ [ final.autoreconfHook final.gnum4 ];
|
||||||
|
M4 = "${final.buildPackages.gnum4}/bin/m4";
|
||||||
|
})
|
||||||
|
else
|
||||||
|
pkg;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
bash = overrideTargetAttrs bash (attrs: {
|
bash = overrideTargetAttrs bash (attrs: {
|
||||||
|
@ -32,6 +44,8 @@ in {
|
||||||
nativeBuildInputs = [ final.updateAutotoolsGnuConfigScriptsHook ];
|
nativeBuildInputs = [ final.updateAutotoolsGnuConfigScriptsHook ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
c-ares = reconfForHost c-ares;
|
||||||
|
|
||||||
cmake = overrideTargetAttrs cmake (attrs: {
|
cmake = overrideTargetAttrs cmake (attrs: {
|
||||||
postInstall = with stdenv; ''
|
postInstall = with stdenv; ''
|
||||||
local MODULE="$out/share/cmake-${
|
local MODULE="$out/share/cmake-${
|
||||||
|
@ -81,6 +95,10 @@ in {
|
||||||
else
|
else
|
||||||
prev.libcCrossChooser name;
|
prev.libcCrossChooser name;
|
||||||
|
|
||||||
|
libev = reconfForHost libev;
|
||||||
|
|
||||||
|
libssh2 = reconfForHost libssh2;
|
||||||
|
|
||||||
libsodium = overrideHostAttrs libsodium (attrs: {
|
libsodium = overrideHostAttrs libsodium (attrs: {
|
||||||
patches = (attrs.patches or [ ]) ++ [ ./libsodium/genode.patch ];
|
patches = (attrs.patches or [ ]) ++ [ ./libsodium/genode.patch ];
|
||||||
});
|
});
|
||||||
|
@ -125,7 +143,7 @@ in {
|
||||||
"rm $out/bin/c_rehash"; # eliminate the perl runtime dependency
|
"rm $out/bin/c_rehash"; # eliminate the perl runtime dependency
|
||||||
});
|
});
|
||||||
|
|
||||||
popt = if hostPlatform.isGenode then null else popt; # libtool problems
|
popt = nullForHost popt; # libtool problems
|
||||||
|
|
||||||
rsync = overrideHost rsync { enableACLs = false; };
|
rsync = overrideHost rsync { enableACLs = false; };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue