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

gst: reduce emulation

Browse Source 
note that i do see runtime errors around gobject-introspection when i
launch `nheko`
This commit is contained in:
Colin 2023-03-04 22:26:48 +00:00
parent a96d0e9630
commit a6c91db11b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/common/cross/default.nix
View File

@ -745,14 +745,20 @@ in
"-Dpython=disabled" "-Dpython=disabled"
]; ];
}); });
inherit (emulated.gst_all_1) gst-plugins-good; # inherit (emulated.gst_all_1) gst-plugins-good;
# gst-plugins-good = prev.gst_all_1.gst-plugins-good.override { # gst-plugins-good = prev.gst_all_1.gst-plugins-good.override {
# # when invoked with `qt5Support = true`, qtbase shows up in both buildInputs and nativeBuildInputs # # when invoked with `qt5Support = true`, qtbase shows up in both buildInputs and nativeBuildInputs
# # if these aren't identical, then qt complains: "Error: detected mismatched Qt dependencies" # # if these aren't identical, then qt complains: "Error: detected mismatched Qt dependencies"
# # doesn't fix the original error. # # doesn't fix the original error.
# inherit (emulated) stdenv; # inherit (emulated) stdenv;
# # TODO: try removing qtbase from nativeBuildInputs? emulate meson, pkg-config &c?
# # qt5Support = true; # # qt5Support = true;
# }; # };
gst-plugins-good = prev.gst_all_1.gst-plugins-good.overrideAttrs (upstream: {
nativeBuildInputs = lib.remove next.qt5.qtbase upstream.nativeBuildInputs;
# TODO: swap in this line instead?
# buildInputs = lib.remove next.qt5.qtbase upstream.buildInputs;
});
}; };
gvfs = prev.gvfs.overrideAttrs (upstream: { gvfs = prev.gvfs.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [ nativeBuildInputs = upstream.nativeBuildInputs ++ [