From ea0cec71ba94d43857e3e1e13ad32d58559dd7cb Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 7 Jul 2020 17:19:25 +0100 Subject: [PATCH] wootility: 3.4.6 -> 3.5.10 --- pkgs/tools/misc/wootility/default.nix | 21 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 00cfd27d2e89f6..c07de47e477f3f 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -1,15 +1,22 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }: - +{ appimageTools +, fetchurl +, lib +, gsettings-desktop-schemas +, gtk3 +, libxkbfile +, udev +, wooting-udev-rules +}: let pname = "wootility"; - version = "3.4.6"; + version = "3.5.10"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q"; + sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y"; }; profile = '' @@ -19,7 +26,11 @@ appimageTools.wrapType2 rec { multiPkgs = extraPkgs; extraPkgs = - pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]); + pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ + udev + wooting-udev-rules + libxkbfile + ]); extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ede249d1c373c..fb844e43885d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7512,7 +7512,9 @@ in woof = callPackage ../tools/misc/woof { }; - wootility = callPackage ../tools/misc/wootility { }; + wootility = callPackage ../tools/misc/wootility { + inherit (xorg) libxkbfile; + }; wpscan = callPackage ../tools/security/wpscan { };