summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/misc/authenticator/default.nix
diff options
context:
space:
mode:
authorRobert Schütz <dev@schuetz-co.de>2021-05-03 12:15:08 +0200
committerRobert Schütz <dev@schuetz-co.de>2021-05-03 12:15:08 +0200
commit310a52ad8947be0afea7fc27d84b59c3bec50308 (patch)
treedb3e11b88afa77e42c23a4893b4fdd658677ed62 /pkgs/applications/misc/authenticator/default.nix
parent27d0a91fd4e57c17417b91344366e6c8210dfeda (diff)
authenticator: unvendor patch
Diffstat (limited to 'pkgs/applications/misc/authenticator/default.nix')
-rw-r--r--pkgs/applications/misc/authenticator/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix
index 89ea3dae229d..511feccbdc55 100644
--- a/pkgs/applications/misc/authenticator/default.nix
+++ b/pkgs/applications/misc/authenticator/default.nix
@@ -62,14 +62,14 @@ stdenv.mkDerivation rec {
glib
gst_all_1.gstreamer
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: {
- patches = [
- #(fetchpatch {
- # url = "https://gitlab.gnome.org/World/Authenticator/-/raw/master/build-aux/767.patch";
- # sha256 = "1g3zkfs248p8wvrvplwrl38vylqsafv6vapfr1nj5kg7ndfrgilf";
- #})
- ./767.patch
+ patches = old.patches or [ ] ++ [
+ "${src}/build-aux/767.patch"
];
mesonFlags = old.mesonFlags ++ [
"-Dgtk3=disabled"
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
gtk4
];
}))
+
gst_all_1.gst-plugins-bad
gtk4
libadwaita