gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #275748 from kashw2/modem-manager-gui

Browse Source 
modem-manager-gui: house keeping; switch to `finalAttrs` pattern
This commit is contained in:
Weijia Wang
2024-01-03 02:19:56 +01:00
committed by GitHub
parent ec07157196 8c844e6964
commit bbd072f215
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/modem-manager-gui/default.nix
+7 -7
View File
@@ -15,7 +15,7 @@
, ninja
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "modem-manager-gui";
version = "0.0.20";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
domain = "salsa.debian.org";
owner = "debian";
repo = "modem-manager-gui";
rev = "upstream%2F${version}";
sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr";
rev = "upstream/${finalAttrs.version}";
hash = "sha256-+VXqfA7TUUemY+DWeRHupWb8weJTeiSMZu+orlcmXd4=";
};
nativeBuildInputs = [
@@ -49,19 +49,19 @@ stdenv.mkDerivation rec {
# 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=";
hash = "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=";
hash = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";
})
# Fix segfault on launch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004258
# Segmentation fault at address: 0x20
(fetchpatch {
url = "https://salsa.debian.org/debian/modem-manager-gui/-/commit/8ccffd6dd6b42625d09d5408f37f155d91411116.patch";
sha256 = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw=";
hash = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw=";
})
];
@@ -83,4 +83,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
mainProgram = "modem-manager-gui";
};
}
})