From bad67f4f1ac73ad1ffab0f8828fa47cafdf9e5e0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 8 Feb 2026 09:21:09 -0600 Subject: [PATCH] q4wine: migrate to by-name --- .../default.nix => by-name/q4/q4wine/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/q4wine/default.nix => by-name/q4/q4wine/package.nix} (90%) diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/by-name/q4/q4wine/package.nix similarity index 90% rename from pkgs/applications/misc/q4wine/default.nix rename to pkgs/by-name/q4/q4wine/package.nix index 5a93c793e10f..23f35e220974 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/by-name/q4/q4wine/package.nix @@ -4,10 +4,7 @@ stdenv, cmake, sqlite, - qtbase, - qtsvg, - qttools, - wrapQtAppsHook, + qt6, icoutils, # build and runtime deps. wget, fuseiso, @@ -29,14 +26,14 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite icoutils - qtbase - qtsvg - qttools + qt6.qtbase + qt6.qtsvg + qt6.qttools ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Add runtime deps. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ca745747ca7..a2e1933dc639 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9598,8 +9598,6 @@ with pkgs; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - q4wine = kdePackages.callPackage ../applications/misc/q4wine { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; gpsbabel-gui = gpsbabel.override {