nixpkgs: 2025-08-27 -> 2025-08-28; remove upstreamed newsflash cross code

This commit is contained in:
2025-08-28 16:01:56 +00:00
parent 94289c2253
commit 1c5c9b80eb
5 changed files with 9 additions and 56 deletions

View File

@@ -349,46 +349,6 @@ in with final; {
# 2025/07/27: upstreaming is unblocked by deps; but turns out to not be this simple
# ncftp = addNativeInputs [ bintools ] prev.ncftp;
# 2025/08/27: upstreaming is unblocked, implemented on desko branch `pr-newsflash-cross`
# newsflash = (prev.newsflash.override {
# cargo = crossCargo;
# }).overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + ''
# rm build.rs
# export OUT_DIR=$(pwd)
# # from build.rs:
# glib-compile-resources --sourcedir=data/resources --target=icons.gresource data/resources/icons.gresource.xml
# glib-compile-resources --sourcedir=data/resources --target=styles.gresource data/resources/styles.gresource.xml
# substitute data/io.gitlab.news_flash.NewsFlash.appdata.xml.in.in \
# data/resources/io.gitlab.news_flash.NewsFlash.appdata.xml \
# --replace-fail '@appid@' 'io.gitlab.news_flash.NewsFlash'
# glib-compile-resources --sourcedir=data/resources --target=appdata.gresource data/resources/appdata.gresource.xml
# '';
# env = let
# ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
# cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
# ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
# cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
# rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget;
# rustTargetPlatform = stdenv.hostPlatform.rust.rustcTarget;
# in (upstream.env or {}) // {
# # taken from <pkgs/build-support/rust/hooks/default.nix>
# # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option -m64"
# # XXX: these aren't necessarily valid environment variables: the referenced nix file is more clever to get them to work.
# "CC_${rustBuildPlatform}" = "${ccForBuild}";
# "CXX_${rustBuildPlatform}" = "${cxxForBuild}";
# "CC_${rustTargetPlatform}" = "${ccForHost}";
# "CXX_${rustTargetPlatform}" = "${cxxForHost}";
# # fails to fix "Failed to find OpenSSL development headers."
# # OPENSSL_NO_VENDOR = 1;
# # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
# # OPENSSL_DIR = "${lib.getDev openssl}";
# };
# });
# fixes "properties/gresource.xml: Permission denied"
# - by providing glib-compile-resources
# 2025/07/27: upstreaming is blocked on gst-plugins-good, qtkeychain, qtmultimedia, qtquick3d, qt-jdenticon