From 1ffc0aa0767dd1aae9bd085f66092ff20935ba47 Mon Sep 17 00:00:00 2001 From: WeetHet Date: Tue, 25 Feb 2025 13:45:16 +0200 Subject: [PATCH] ripes: move to by-name --- .../default.nix => by-name/ri/ripes/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/emulators/ripes/default.nix => by-name/ri/ripes/package.nix} (93%) diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/by-name/ri/ripes/package.nix similarity index 93% rename from pkgs/applications/emulators/ripes/default.nix rename to pkgs/by-name/ri/ripes/package.nix index 61cc99cbc46c..0ba305535d10 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/by-name/ri/ripes/package.nix @@ -3,10 +3,7 @@ stdenv, fetchFromGitHub, pkg-config, - qtbase, - qtsvg, - qtcharts, - wrapQtAppsHook, + qt6, cmake, python3, unstableGitUpdater, @@ -29,13 +26,13 @@ stdenv.mkDerivation rec { cmake pkg-config python3 - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg - qtcharts + qt6.qtbase + qt6.qtsvg + qt6.qtcharts ]; installPhase = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c02f67bcd8d..e89bcbe73680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1404,8 +1404,6 @@ with pkgs; py65 = with python3.pkgs; toPythonApplication py65; - ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; - rmg-wayland = callPackage ../by-name/rm/rmg/package.nix { withWayland = true; };