summary refs log tree commit diff
path: root/pkgs/applications/networking/gns3/gui.nix
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-06-26 15:18:34 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-08-08 15:11:47 +0200
commita2498f5aced9c3653b33f3f8daba893d6fbbad30 (patch)
tree861c2d53ba2b51245c553b3af71a8e32e72de9f7 /pkgs/applications/networking/gns3/gui.nix
parentb5eb32289c4cc77f0ba68c7cf8fa821634a9b523 (diff)
downloadnixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.gz
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.bz2
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.lz
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.xz
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.zst
nixpkgs-a2498f5aced9c3653b33f3f8daba893d6fbbad30.zip
gns3-gui: Replace qt5Full with wrapQtApp (proper solution)
This will now properly wrap the gns3 binary using wrapQtApp instead of
unnecessarily adding qt5Full to the PATH (which significantly increases
the closure and often causes the build to break due to broken transitive
dependencies).
This supersedes the old approach from commit 0eaec4dee27.
Diffstat (limited to 'pkgs/applications/networking/gns3/gui.nix')
-rw-r--r--pkgs/applications/networking/gns3/gui.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 7cdc74dfd48..8eb688bcd56 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -1,6 +1,6 @@
 { stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
 
-{ lib, stdenv, python3, pkgs, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub, wrapQtAppsHook }:
 
 let
   defaultOverrides = commonOverrides ++ [
@@ -20,16 +20,20 @@ in python.pkgs.buildPythonPackage rec {
     sha256 = sha256Hash;
   };
 
+  nativeBuildInputs = [ wrapQtAppsHook ];
   propagatedBuildInputs = with python.pkgs; [
     sentry-sdk psutil jsonschema # tox for check
     # Runtime dependencies
     sip (pyqt5.override { withWebSockets = true; }) distro setuptools
-    pkgs.qt5Full
   ];
 
   doCheck = false; # Failing
+  dontWrapQtApps = true;
+  postFixup = ''
+      wrapQtApp "$out/bin/gns3"
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical Network Simulator 3 GUI (${branch} release)";
     longDescription = ''
       Graphical user interface for controlling the GNS3 network simulator. This