From dc5f9d7ea9a8b6b114f89294de32432c869b8738 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 24 Nov 2024 15:31:08 +0400 Subject: [PATCH 1/2] gpxlab: add symlink to binary on darwin --- pkgs/applications/misc/gpxlab/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index c3002104256c..4f1e3abde2f9 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -22,6 +22,9 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications + + mkdir -p $out/bin + ln -s $out/Applications/GPXLab.app/Contents/MacOS/GPXLab $out/bin/gpxlab ''; meta = with lib; { From bd4e8d2878d69676cecfc7b04fb9b651d5abde5d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 24 Nov 2024 15:37:51 +0400 Subject: [PATCH 2/2] gpxlab: migrate to by-name --- .../default.nix => by-name/gp/gpxlab/package.nix} | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/gpxlab/default.nix => by-name/gp/gpxlab/package.nix} (86%) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/by-name/gp/gpxlab/package.nix similarity index 86% rename from pkgs/applications/misc/gpxlab/default.nix rename to pkgs/by-name/gp/gpxlab/package.nix index 4f1e3abde2f9..07d09dd0edad 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/by-name/gp/gpxlab/package.nix @@ -1,8 +1,11 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub -, qmake, qttools +{ + stdenv, + lib, + fetchFromGitHub, + qt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "gpxlab"; version = "0.7.0"; @@ -13,7 +16,11 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook + ]; preConfigure = '' lrelease GPXLab/locale/*.ts diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98a076259d50..4e3d28d5916d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14294,8 +14294,6 @@ with pkgs; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; - gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };