mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
Merge pull request #171462 from 7FM/patch-1
modem-manager-gui: fix build with meson >= 0.61
This commit is contained in:
commit
602292f93d
1 changed files with 15 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
|||
, pkg-config
|
||||
, python3
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gtk3
|
||||
, glib
|
||||
, gdbm
|
||||
|
@ -44,6 +45,20 @@ stdenv.mkDerivation rec {
|
|||
libayatana-appindicator-gtk3
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix missing tray icon
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch";
|
||||
sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";
|
||||
})
|
||||
# Fix build with meson 0.61
|
||||
# appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch";
|
||||
sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs man/manhelper.py
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue