diff options
author | Azat Bahawi <azat@bahawi.net> | 2023-07-09 14:22:15 +0300 |
---|---|---|
committer | Azat Bahawi <azat@bahawi.net> | 2023-07-09 14:22:15 +0300 |
commit | ab63f2eb09ed6633a7fad7a1a72b60bb14d5c85c (patch) | |
tree | 72f32b1f4e2f0e57b90722ebd5b0ec19e8f8f15b /modules/common/common | |
parent | a08d9d966a3bc60ac917a5a94b766f8d2487d6db (diff) |
2023-07-09
Diffstat (limited to 'modules/common/common')
-rw-r--r-- | modules/common/common/nix/default.nix | 64 |
1 files changed, 61 insertions, 3 deletions
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index 5dda142..840bdab 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -4,7 +4,6 @@ lib, localUsername ? lib.my.username, pkgs, - pkgsPr, this, ... }: @@ -115,9 +114,68 @@ with lib; { luajit ]); }); - - inherit (pkgsPr "228852" "sha256-NKZySJ3IVMMeSmpc1zYwse52kxGg0dIrsHTMcO8a73Y=") soju; } + // (let + openconnect = super.openconnect.overrideAttrs (_: _: { + version = "unstable-2023-07-01"; + src = super.fetchFromGitLab { + owner = "openconnect"; + repo = "openconnect"; + rev = "0e5a69e8f990ece134b50ec0be7b6bf42f14dfbd"; + hash = "sha256-/8ybs7tlmdVIZORxdcB/xE9Mpyo2cX+VN7eQAS7Qb5k="; + }; + }); + in { + networkmanager-openconnect = + (super.networkmanager-openconnect.override {inherit openconnect;}) + .overrideAttrs (_: final: { + version = "unstable-2023-05-29"; + src = super.fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "NetworkManager-openconnect"; + rev = "030a3a9f05560bdb515ec2a6dad3a0ffbab3b213"; + hash = "sha256-GvhBKAQmbmzgM1Bh2j6carnGwtL/z5rbPl/jL/4kDoc="; + }; + buildInputs = + final.buildInputs + ++ [ + (super.webkitgtk_4_1.override { + inherit (super.gnome) libsoup; + }) + ]; + nativeBuildInputs = + final.nativeBuildInputs + ++ [ + super.autoreconfHook + ]; + preAutoreconf = '' + autoupdate + ''; + preConfigure = '' + NOCONFIGURE=x ./autogen.sh + touch gtk4/nm-openconnect-dialog.ui + ''; + }); + + plasma5Packages = + super.plasma5Packages + // { + plasma-nm = + (super.plasma5Packages.plasma-nm.override {inherit openconnect;}) + .overrideAttrs (_: final: { + buildInputs = final.buildInputs ++ [super.qt5.qtwebengine]; + patches = + final.patches + ++ [ + (super.fetchpatch { + url = "https://invent.kde.org/plasma/plasma-nm/-/commit/6ef64be8645ac32fc0b42df2cee5d9ff3b57e485.patch"; + sha256 = "sha256-b5yTMB7s+wG7X/EyuEa5tBrUU8oKc1Wa0zn0ND1rtI0="; + }) + ]; + }); + }; + }) // (with super; let np = nodePackages; in { |