diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 92d2c722..603b2f59 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -23,6 +23,17 @@ let // (if title != null then { name = title; } else {}) ); in [ + (fetchpatch' { + # needed for Gnome 44 -> 45 patch to apply + title = "telegram-desktop: build on Darwin"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/268592"; + hash = "sha256-NqlXr739BbSouQ9ubo7s2rilWa3i/G0UlzH4JqXH3aw="; + }) + (fetchpatch' { + title = "Gnome 44 -> 45"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/269032"; + hash = "sha256-sxI5DXCzs6U8XDRTP0T4dOhEXCVxB5vUKyjNd46vmE8="; + }) (fetchpatch' { # build fix: merged 2023/11/17 title = "python2/mk-python-derivation: disable catchConflictsHook"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 0b04e1b7..a6d81b16 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -126,7 +126,6 @@ let # jackett doesn't allow customization of the bind address: this will probably always be here. jackett = callPackage ./patched/jackett { inherit (unpatched) jackett; }; - libgweather = callPackage ./patched/libgweather { inherit (unpatched) libgweather; }; # modemmanager = callPackage ./patched/modemmanager { inherit (unpatched) modemmanager; }; diff --git a/pkgs/patched/libgweather/default.nix b/pkgs/patched/libgweather/default.nix deleted file mode 100644 index ebc2fdad..00000000 --- a/pkgs/patched/libgweather/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, libgweather -, fetchpatch -, ... -}@attrs: -(libgweather.override - (removeAttrs attrs [ "fetchpatch" "libgweather" ]) -).overrideAttrs (upstream: { - patches = lib.unique ( - (upstream.patches or []) ++ [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/282.patch"; - name = "nws: fix null string comparison when reading visibility"; - hash = "sha256-yQncWfJJmXOTw8Kvxutjjlenjv1g5QR5JnLU4QhMXSo="; - }) - ] - ); -})