colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

newsflash: simplify cross compilation

Browse Source
This commit is contained in:
Colin
2024-08-09 09:52:21 +00:00
parent fd0188025d
commit 7b043d0c87
1 changed files with 39 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
overlays/cross.nix
View File

@@ -864,31 +864,23 @@ in with final; {
# 2023/07/31: upstreaming is blocked on vpnc cross compilation # 2023/07/31: upstreaming is blocked on vpnc cross compilation
# networkmanager-vpnc = mvToNativeInputs [ glib ] prev.networkmanager-vpnc; # networkmanager-vpnc = mvToNativeInputs [ glib ] prev.networkmanager-vpnc;
newsflash = prev.newsflash.overrideAttrs (upstream: { newsflash = (prev.newsflash.override {
nativeBuildInputs = (lib.filter (p: !lib.elem (p.pname or p.name) [ "gdk-pixbuf" "blueprint-compiler" ]) upstream.nativeBuildInputs) ++ [ blueprint-compiler = buildPackages.writeShellScriptBin "blueprint-compiler" ''
buildPackages.git
(buildPackages.writeShellScriptBin "blueprint-compiler" ''
export GI_TYPELIB_PATH=${typelibPath [ export GI_TYPELIB_PATH=${typelibPath [
buildPackages.clapper buildPackages.clapper
buildPackages.glib buildPackages.glib
buildPackages.gtk4 buildPackages.gtk4
buildPackages.gst_all_1.gstreamer 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-base
buildPackages.gst_all_1.gst-plugins-good
buildPackages.gst_all_1.gst-plugins-bad
buildPackages.gdk-pixbuf buildPackages.gdk-pixbuf
buildPackages.pango
buildPackages.graphene buildPackages.graphene
buildPackages.harfbuzz buildPackages.harfbuzz
buildPackages.libadwaita buildPackages.libadwaita
buildPackages.pango
]} ]}
exec ${lib.getExe buildPackages.blueprint-compiler} "$@" exec ${lib.getExe buildPackages.blueprint-compiler} "$@"
'') '';
]; }).overrideAttrs (upstream: {
# strictDeps = false;
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/meson.build --replace-fail \ substituteInPlace src/meson.build --replace-fail \
"'src' / rust_target" \ "'src' / rust_target" \
@@ -939,18 +931,6 @@ in with final; {
# OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
# OPENSSL_DIR = "${lib.getDev openssl}"; # 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" # fixes "properties/gresource.xml: Permission denied"