BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #155912: wpa_supplicant_gui: fix build after update

Browse source
This commit is contained in:
Vladimír Čunát 2022-01-20 21:04:29 +01:00
commit b02c25a393
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/wpa_supplicant/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, openssl, pkg-config, libnl { lib, stdenv, fetchurl, openssl, pkg-config, libnl
, nixosTests , nixosTests, wpa_supplicant_gui
, withDbus ? true, dbus , withDbus ? true, dbus
, withReadline ? true, readline , withReadline ? true, readline
, withPcsclite ? true, pcsclite , withPcsclite ? true, pcsclite
@ -113,6 +113,7 @@ stdenv.mkDerivation rec {
passthru.tests = { passthru.tests = {
inherit (nixosTests) wpa_supplicant; inherit (nixosTests) wpa_supplicant;
inherit wpa_supplicant_gui; # inherits the src+version updates
}; };
meta = with lib; { meta = with lib; {

13
pkgs/os-specific/linux/wpa_supplicant/gui.nix
View file

@ -2,18 +2,7 @@
mkDerivation { mkDerivation {
pname = "wpa_gui"; pname = "wpa_gui";
version = wpa_supplicant.version; inherit (wpa_supplicant) version src;
inherit (wpa_supplicant) src;
patches = [
# Fix build with Inkscape 1.0
# https://github.com/NixOS/nixpkgs/issues/86930
(fetchpatch {
url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754";
sha256 = "05hs74qawa433adripzhycm45g7yvxr6074nd4zcl4gabzp9hd30";
})
];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake inkscape imagemagick ]; nativeBuildInputs = [ qmake inkscape imagemagick ];