From 74cb07175b8788ad33dcc622aca8769828b925d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Nov 2021 14:18:10 -0500 Subject: [PATCH 1/2] qvge: enable on darwin --- pkgs/applications/graphics/qvge/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index f50e87d1eddb..c5712c38095f 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , qmake +, qtsvg , qtx11extras , graphviz }: @@ -27,13 +28,13 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; - buildInputs = [ qtx11extras ]; + buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; homepage = "https://github.com/ArsMasiuk/qvge"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } From fedc3db7ba5a6f29f2518db4c01fcda87ef0c487 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Nov 2021 14:18:32 -0500 Subject: [PATCH 2/2] qvge: don't use libsForQt5.mkDerivation --- pkgs/applications/graphics/qvge/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index c5712c38095f..442e3200e469 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -1,14 +1,15 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , substituteAll +, wrapQtAppsHook , qmake , qtsvg , qtx11extras , graphviz }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qvge"; version = "0.6.3"; @@ -26,7 +27,7 @@ mkDerivation rec { inherit graphviz; }); - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ wrapQtAppsHook qmake ]; buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ];