diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-06-26 15:18:34 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-08-08 15:11:47 +0200 |
commit | a2498f5aced9c3653b33f3f8daba893d6fbbad30 (patch) | |
tree | 861c2d53ba2b51245c553b3af71a8e32e72de9f7 /pkgs/applications/networking/gns3 | |
parent | b5eb32289c4cc77f0ba68c7cf8fa821634a9b523 (diff) | |
download | nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.gz nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.bz2 nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.lz nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.xz nixlib-a2498f5aced9c3653b33f3f8daba893d6fbbad30.tar.zst nixlib-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')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index f4d377c4c553..73f2ab252642 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, libsForQt5 }: let stableVersion = "2.2.12"; @@ -24,7 +24,7 @@ let "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; - mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; + mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; guiSrcHash = "05nnil8ljyj6h366yrniv6syznhhbnb7nzjkz5785rb9pzjizs19"; serverSrcHash = "0gmfdnymiw4w13qbcsvd71yj3hc9640n43c305vq39hahvsn7rvc"; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 7cdc74dfd482..8eb688bcd56d 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 |