Unverified Commit ee19ecd4 authored by Sizhe Zhao's avatar Sizhe Zhao
Browse files

firewalld: wrap gui programs with qt6

parent 3a1c054b

pkgs/by-name/fi/firewalld/package.nix

+32 −21
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
  networkmanagerapplet,

  pkg-config,

  python3,

  qt6,

  sysctl,

  wrapGAppsNoGuiHook,

  withGui ? false,
@@ -72,7 +73,8 @@ stdenv.mkDerivation rec { 
        --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"

    '';



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      autoconf

      automake

      docbook_xml_dtd_42
@@ -89,6 +91,9 @@ stdenv.mkDerivation rec { 
      python3.pkgs.wrapPython

      sysctl

      wrapGAppsNoGuiHook

    ]

    ++ lib.optionals withGui [

      qt6.wrapQtAppsHook

    ];



  buildInputs =
@@ -105,6 +110,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optionals withGui [

      gtk3

      libnotify

      qt6.qtbase

    ];



  preConfigure = ''
@@ -116,9 +122,14 @@ stdenv.mkDerivation rec { 
  '';



  dontWrapGApps = true;

  dontWrapQtApps = true;



  preFixup = ''

  preFixup =

    ''

      makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

    ''

    + lib.optionalString withGui ''

      makeWrapperArgs+=("''${qtWrapperArgs[@]}")

    '';



  postFixup = ''