authenticator: unvendor patch

This commit is contained in:
Robert Schütz 2021-05-03 12:15:08 +02:00
parent 27d0a91fd4
commit 310a52ad89
2 changed files with 8 additions and 1959 deletions

File diff suppressed because it is too large Load diff

View file

@ -62,14 +62,14 @@ stdenv.mkDerivation rec {
glib glib
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
# See https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json
# gst-plugins-good needs gtk4 support:
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767
# We copy the way it is built from the Flatpak:
# https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json
(gst_all_1.gst-plugins-good.overrideAttrs (old: { (gst_all_1.gst-plugins-good.overrideAttrs (old: {
patches = [ patches = old.patches or [ ] ++ [
#(fetchpatch { "${src}/build-aux/767.patch"
# url = "https://gitlab.gnome.org/World/Authenticator/-/raw/master/build-aux/767.patch";
# sha256 = "1g3zkfs248p8wvrvplwrl38vylqsafv6vapfr1nj5kg7ndfrgilf";
#})
./767.patch
]; ];
mesonFlags = old.mesonFlags ++ [ mesonFlags = old.mesonFlags ++ [
"-Dgtk3=disabled" "-Dgtk3=disabled"
@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
gtk4 gtk4
]; ];
})) }))
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gtk4 gtk4
libadwaita libadwaita