gnome 44 -> 45

This commit is contained in:
Colin 2023-11-21 23:11:41 +00:00
parent 70b273a0d2
commit beb13b8f84
3 changed files with 11 additions and 19 deletions

View File

@ -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";

View File

@ -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; };

View File

@ -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=";
})
]
);
})