diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/desktops/plasma-5/plasma-nm | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5/plasma-nm')
| -rw-r--r-- | nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix | 78 |
1 files changed, 62 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix index 54c8079cf5f4..1915196e4949 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,28 +1,74 @@ -{ - mkDerivation, lib, substituteAll, - extra-cmake-modules, kdoctools, - kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, - ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid, - - mobile-broadband-provider-info, openconnect, openvpn, - modemmanager-qt, networkmanager-qt, qca-qt5, - qtbase, qtdeclarative, qttools, +{ mkDerivation +, substituteAll +, extra-cmake-modules +, kdoctools +, kcmutils +, kcompletion +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kinit +, kio +, kitemviews +, knotifications +, kservice +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, prison +, solid +, mobile-broadband-provider-info +, openconnect +, openvpn +, modemmanager-qt +, networkmanager-qt +, qca-qt5 +, qtdeclarative +, qttools }: mkDerivation { pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ - kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion - kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - prison solid + kdeclarative + ki18n + kio + kwindowsystem + plasma-framework + kcompletion + kcmutils + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kinit + kitemviews + knotifications + kservice + kwallet + kwidgetsaddons + kxmlgui + prison + solid qtdeclarative - modemmanager-qt networkmanager-qt qca-qt5 - mobile-broadband-provider-info openconnect + modemmanager-qt + networkmanager-qt + qca-qt5 + mobile-broadband-provider-info + openconnect + ]; + + cmakeFlags = [ + "-DBUILD_MOBILE=ON" ]; + patches = [ (substituteAll { src = ./0002-openvpn-binary-path.patch; |