From a0bd0331ab437ab0bee1cbad6646e3374bdc9fb5 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 29 Oct 2025 02:28:11 +0000 Subject: [PATCH] gpsbabel: migrate to pkgs/by-name --- .../gp}/gpsbabel/debian-patches.nix | 0 .../gp}/gpsbabel/debian-patches.txt | 0 .../gp/gpsbabel/package.nix} | 16 ++++++---------- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 6 insertions(+), 12 deletions(-) rename pkgs/{applications/misc => by-name/gp}/gpsbabel/debian-patches.nix (100%) rename pkgs/{applications/misc => by-name/gp}/gpsbabel/debian-patches.txt (100%) rename pkgs/{applications/misc/gpsbabel/default.nix => by-name/gp/gpsbabel/package.nix} (95%) diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.nix b/pkgs/by-name/gp/gpsbabel/debian-patches.nix similarity index 100% rename from pkgs/applications/misc/gpsbabel/debian-patches.nix rename to pkgs/by-name/gp/gpsbabel/debian-patches.nix diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.txt b/pkgs/by-name/gp/gpsbabel/debian-patches.txt similarity index 100% rename from pkgs/applications/misc/gpsbabel/debian-patches.txt rename to pkgs/by-name/gp/gpsbabel/debian-patches.txt diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/by-name/gp/gpsbabel/package.nix similarity index 95% rename from pkgs/applications/misc/gpsbabel/default.nix rename to pkgs/by-name/gp/gpsbabel/package.nix index b295a61ac05e..9943ed44cafc 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/by-name/gp/gpsbabel/package.nix @@ -5,16 +5,11 @@ fetchurl, pkg-config, which, - qmake, - qttools, - wrapQtAppsHook, libusb1, shapelib, zlib, withGUI ? false, - qtserialport, withMapPreview ? (!stdenv.hostPlatform.isDarwin), - qtwebengine, withDoc ? false, docbook_xml_dtd_45, docbook_xsl, @@ -23,6 +18,7 @@ libxml2, libxslt, perl, + libsForQt5, }: stdenv.mkDerivation rec { @@ -56,11 +52,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake ] ++ lib.optionals withGUI [ - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ] ++ lib.optionals withDoc [ docbook_xml_dtd_45 @@ -77,8 +73,8 @@ stdenv.mkDerivation rec { shapelib zlib ] - ++ lib.optional withGUI qtserialport - ++ lib.optional (withGUI && withMapPreview) qtwebengine; + ++ lib.optional withGUI libsForQt5.qtserialport + ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine; nativeCheckInputs = [ libxml2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29121569c230..d03821feac35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11279,8 +11279,6 @@ with pkgs; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; - gpsbabel-gui = gpsbabel.override { withGUI = true; withDoc = true;