diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
commit | a2c1eff83c3118a9aee8076c7f84f58137416b6e (patch) | |
tree | 4668c9ad2bba229a0eb3ccc8adbe78402e04ab07 /nixpkgs/pkgs/development/libraries/kde-frameworks | |
parent | fa7e5142244bb8fd1c51b66df6e623a7f41cc0d3 (diff) | |
parent | 85f1ba3e51676fa8cc604a3d863d729026a6b8eb (diff) | |
download | nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.gz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.bz2 nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.lz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.xz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.zst nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index e9f812d68da8..a9d4baebf1c1 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -2,10 +2,25 @@ mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, + fetchpatch }: mkDerivation { pname = "networkmanager-qt"; + + # backport patches for NetworkManager 1.44 compatibility + # FIXME: remove in 5.112 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d9a938ddbfb5800503935926301ff2865ab77a6d.patch"; + hash = "sha256-EjFBcU0YJQocp8skDZUTxCQhfrtQP5Fdo8q1BC9lLnQ="; + }) + (fetchpatch { + url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d35c6cb97443424d228dfd8eee8282af6632b5f5.patch"; + hash = "sha256-KmRcCjdHGGk+5PY5JKNbk0BHCtdwibns+Hw4aNRaoZI="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; |