diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/by-name/fi/firebird-emu/package.nix similarity index 86% rename from pkgs/applications/emulators/firebird-emu/default.nix rename to pkgs/by-name/fi/firebird-emu/package.nix index 5ec7352d5774..ce6fd7b7ebf9 100644 --- a/pkgs/applications/emulators/firebird-emu/default.nix +++ b/pkgs/by-name/fi/firebird-emu/package.nix @@ -2,11 +2,7 @@ stdenv, lib, fetchFromGitHub, - qmake, - qtbase, - qtdeclarative, - qtquickcontrols, - wrapQtAppsHook, + qt5, }: stdenv.mkDerivation (finalAttrs: { pname = "firebird-emu"; @@ -21,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - wrapQtAppsHook - qmake + qt5.wrapQtAppsHook + qt5.qmake ]; buildInputs = [ - qtbase - qtdeclarative - qtquickcontrols + qt5.qtbase + qt5.qtdeclarative + qt5.qtquickcontrols ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30cc67350b58..d59d23cf70ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1249,8 +1249,6 @@ with pkgs; fceux-qt5 = fceux.override { ___qtVersion = "5"; }; fceux-qt6 = fceux.override { ___qtVersion = "6"; }; - firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; goldberg-emu = callPackage ../applications/emulators/goldberg-emu {