Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e16ca535e9d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 219382bf2832
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 17, 2020

  1. wpa_supplicant_gui: fix build with Inkscape 1.0

    @jtojnar
    jtojnar committed May 17, 2020
    Copy the full SHA
    219382b View commit details
Showing with 11 additions and 2 deletions.
  1. +11 −2 pkgs/os-specific/linux/wpa_supplicant/gui.nix
13 changes: 11 additions & 2 deletions pkgs/os-specific/linux/wpa_supplicant/gui.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:

mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";

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 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY=";
})
];

buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake inkscape imagemagick ];

prePatch = ''
postPatch = ''
cd wpa_supplicant/wpa_gui-qt4
'';