newsflash: simplify cross compilation
This commit is contained in:
@@ -864,31 +864,23 @@ in with final; {
|
||||
# 2023/07/31: upstreaming is blocked on vpnc cross compilation
|
||||
# networkmanager-vpnc = mvToNativeInputs [ glib ] prev.networkmanager-vpnc;
|
||||
|
||||
newsflash = prev.newsflash.overrideAttrs (upstream: {
|
||||
nativeBuildInputs = (lib.filter (p: !lib.elem (p.pname or p.name) [ "gdk-pixbuf" "blueprint-compiler" ]) upstream.nativeBuildInputs) ++ [
|
||||
buildPackages.git
|
||||
(buildPackages.writeShellScriptBin "blueprint-compiler" ''
|
||||
newsflash = (prev.newsflash.override {
|
||||
blueprint-compiler = buildPackages.writeShellScriptBin "blueprint-compiler" ''
|
||||
export GI_TYPELIB_PATH=${typelibPath [
|
||||
buildPackages.clapper
|
||||
buildPackages.glib
|
||||
buildPackages.gtk4
|
||||
buildPackages.gst_all_1.gstreamer
|
||||
# some of these below are probably *not* needed
|
||||
buildPackages.gst_all_1.gst-plugins-base
|
||||
buildPackages.gst_all_1.gst-plugins-good
|
||||
buildPackages.gst_all_1.gst-plugins-bad
|
||||
buildPackages.gdk-pixbuf
|
||||
buildPackages.pango
|
||||
buildPackages.graphene
|
||||
buildPackages.harfbuzz
|
||||
buildPackages.libadwaita
|
||||
buildPackages.pango
|
||||
]}
|
||||
exec ${lib.getExe buildPackages.blueprint-compiler} "$@"
|
||||
'')
|
||||
];
|
||||
|
||||
# strictDeps = false;
|
||||
|
||||
'';
|
||||
}).overrideAttrs (upstream: {
|
||||
postPatch = (upstream.postPatch or "") + ''
|
||||
substituteInPlace src/meson.build --replace-fail \
|
||||
"'src' / rust_target" \
|
||||
@@ -939,18 +931,6 @@ in with final; {
|
||||
# OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
# OPENSSL_DIR = "${lib.getDev openssl}";
|
||||
};
|
||||
|
||||
# mesonFlags = let
|
||||
# crossFile = writeText "cross-file.conf" ''
|
||||
# [binaries]
|
||||
# rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ]
|
||||
# '';
|
||||
# in
|
||||
# (upstream.mesonFlags or []) ++ [
|
||||
# "-Dprofile=development"
|
||||
# ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# "--cross-file=${crossFile}"
|
||||
# ];
|
||||
});
|
||||
|
||||
# fixes "properties/gresource.xml: Permission denied"
|
||||
|
Reference in New Issue
Block a user