From 26d8119a24991687a9f06be10864aa629de0c1c2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 31 May 2026 00:24:19 +0200 Subject: [PATCH] yabause: migrate to pkgs/by-name --- .../ya}/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch | 0 .../ya}/yabause/linkage-rwx-linux-elf.patch | 0 .../default.nix => by-name/ya/yabause/package.nix} | 12 +++--------- pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 3 insertions(+), 14 deletions(-) rename pkgs/{applications/emulators => by-name/ya}/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch (100%) rename pkgs/{applications/emulators => by-name/ya}/yabause/linkage-rwx-linux-elf.patch (100%) rename pkgs/{applications/emulators/yabause/default.nix => by-name/ya/yabause/package.nix} (91%) diff --git a/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/by-name/ya/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch similarity index 100% rename from pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch rename to pkgs/by-name/ya/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/by-name/ya/yabause/linkage-rwx-linux-elf.patch similarity index 100% rename from pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch rename to pkgs/by-name/ya/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/by-name/ya/yabause/package.nix similarity index 91% rename from pkgs/applications/emulators/yabause/default.nix rename to pkgs/by-name/ya/yabause/package.nix index 7a41fc71cf02..c6b4b18885da 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/by-name/ya/yabause/package.nix @@ -4,14 +4,10 @@ fetchurl, cmake, pkg-config, - wrapQtAppsHook, - qtbase, qt5, libGLU, libGL, - libglut ? null, - openal ? null, - SDL2 ? null, + SDL2, }: stdenv.mkDerivation rec { @@ -26,15 +22,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt5.qtbase qt5.qtmultimedia libGLU libGL - libglut - openal SDL2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e2d1280902..a147910b021e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1341,11 +1341,6 @@ with pkgs; x16-rom = x16.rom; x16-run = x16.run; - yabause = libsForQt5.callPackage ../applications/emulators/yabause { - libglut = null; - openal = null; - }; - ### APPLICATIONS/FILE-MANAGERS vifm-full = vifm.override {