From ea3677e44dae8e0909829edef2d447eb4e8635c5 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 29 Oct 2025 02:28:56 +0000 Subject: [PATCH] synergy: migrate to pkgs/by-name --- .../sy}/synergy/darwin-non-static-openssl.patch | 0 .../default.nix => by-name/sy/synergy/package.nix} | 8 +++----- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{applications/misc => by-name/sy}/synergy/darwin-non-static-openssl.patch (100%) rename pkgs/{applications/misc/synergy/default.nix => by-name/sy/synergy/package.nix} (96%) diff --git a/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch b/pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch similarity index 100% rename from pkgs/applications/misc/synergy/darwin-non-static-openssl.patch rename to pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/by-name/sy/synergy/package.nix similarity index 96% rename from pkgs/applications/misc/synergy/default.nix rename to pkgs/by-name/sy/synergy/package.nix index 7fc41a067fcd..ca46b4721acc 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/by-name/sy/synergy/package.nix @@ -3,7 +3,6 @@ stdenv, lib, fetchFromGitHub, - wrapQtAppsHook, cmake, openssl, @@ -14,7 +13,6 @@ pkg-config, gdk-pixbuf, libnotify, - qttools, libICE, libSM, libX11, @@ -26,7 +24,7 @@ xkeyboardconfig, xinput, avahi-compat, - + libsForQt5, }: stdenv.mkDerivation rec { @@ -62,10 +60,10 @@ stdenv.mkDerivation rec { cmake pkg-config ] - ++ lib.optional withGUI wrapQtAppsHook; + ++ lib.optional withGUI libsForQt5.wrapQtAppsHook; buildInputs = [ - qttools # Used for translations even when not building the GUI + libsForQt5.qttools # Used for translations even when not building the GUI openssl pcre ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19909903643e..6c4b22d8addc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12404,8 +12404,6 @@ with pkgs; systemdSupport = true; }; - synergy = libsForQt5.callPackage ../applications/misc/synergy { }; - synergyWithoutGUI = synergy.override { withGUI = false; }; tabbed = callPackage ../applications/window-managers/tabbed {