cross compilation: stop emulating psql
This commit is contained in:
parent
6a735cc0bc
commit
8230389b21
|
@ -1008,10 +1008,10 @@ in
|
||||||
# fixes `spa/plugins/bluez5/meson.build:41:0: ERROR: Program 'gdbus-codegen' not found or not executable`
|
# fixes `spa/plugins/bluez5/meson.build:41:0: ERROR: Program 'gdbus-codegen' not found or not executable`
|
||||||
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
|
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
|
||||||
});
|
});
|
||||||
psqlodbc = prev.psqlodbc.override {
|
# psqlodbc = prev.psqlodbc.override {
|
||||||
# fixes "configure: error: odbc_config not found (required for unixODBC build)"
|
# # fixes "configure: error: odbc_config not found (required for unixODBC build)"
|
||||||
inherit (emulated) stdenv;
|
# inherit (emulated) stdenv;
|
||||||
};
|
# };
|
||||||
|
|
||||||
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
(py-next: py-prev: {
|
(py-next: py-prev: {
|
||||||
|
@ -1164,15 +1164,15 @@ in
|
||||||
});
|
});
|
||||||
unixODBCDrivers = prev.unixODBCDrivers // {
|
unixODBCDrivers = prev.unixODBCDrivers // {
|
||||||
# TODO: should this package be deduped with toplevel psqlodbc in upstream nixpkgs?
|
# TODO: should this package be deduped with toplevel psqlodbc in upstream nixpkgs?
|
||||||
psql = prev.unixODBCDrivers.psql.override {
|
psql = prev.unixODBCDrivers.psql.overrideAttrs (_upstream: {
|
||||||
# fixes "configure: error: odbc_config not found (required for unixODBC build)"
|
# XXX: these are both available as configureFlags, if we prefer that (we probably do, so as to make them available only during specific parts of the build).
|
||||||
inherit (emulated) stdenv;
|
ODBC_CONFIG = next.buildPackages.writeShellScript "odbc_config" ''
|
||||||
};
|
exec ${next.stdenv.hostPlatform.emulator next.buildPackages} ${next.unixODBC}/bin/odbc_config $@
|
||||||
# psql = prev.unixODBCDrivers.psql.overrideAttrs (orig: {
|
'';
|
||||||
# # fixes "configure: error: odbc_config not found (required for unixODBC build)"
|
PG_CONFIG = next.buildPackages.writeShellScript "pg_config" ''
|
||||||
# # new error: "/nix/store/h3ms3h95rbj5p8yhxfhbsbnxgvpnb8w0-aarch64-unknown-linux-gnu-binutils-2.39/bin/aarch64-unknown-linux-gnu-ld: /nix/store/6h6z98qvg5k8rsqpivi42r5008zjfp2v-unixODBC-2.3.11/lib/libodbcinst.so: error adding symbols: file in wrong format"
|
exec ${next.stdenv.hostPlatform.emulator next.buildPackages} ${next.postgresql}/bin/pg_config $@
|
||||||
# nativeBuildInputs = orig.nativeBuildInputs or [] ++ orig.buildInputs;
|
'';
|
||||||
# });
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
vlc = prev.vlc.overrideAttrs (orig: {
|
vlc = prev.vlc.overrideAttrs (orig: {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user