From 92d6085418f25453425d51fd43f7bc291ce33a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 May 2026 19:47:38 -0700 Subject: [PATCH] qmediathekview: 0.2.1 -> 0.2.3 Diff: https://github.com/adamreichold/QMediathekView/compare/v0.2.1...v0.2.3 --- pkgs/by-name/qm/qmediathekview/package.nix | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qm/qmediathekview/package.nix b/pkgs/by-name/qm/qmediathekview/package.nix index e23be092fe02..62296d33d614 100644 --- a/pkgs/by-name/qm/qmediathekview/package.nix +++ b/pkgs/by-name/qm/qmediathekview/package.nix @@ -4,19 +4,32 @@ fetchFromGitHub, boost, xz, + cargo, pkg-config, - libsForQt5, + qt6Packages, + rustPlatform, + sqlite, }: stdenv.mkDerivation (finalAttrs: { pname = "QMediathekView"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "adamreichold"; repo = "QMediathekView"; tag = "v${finalAttrs.version}"; - sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; + hash = "sha256-miqCzNTqbZwPuy6P911wlf5TF1lECzNW/02/edK8XaU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) + pname + version + src + cargoRoot + ; + hash = "sha256-89ogtmtJRgMoPOjyW+OGoptKE8VP9lUhbsB5vrdP7zQ="; }; postPatch = '' @@ -25,17 +38,24 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - libsForQt5.qtbase + qt6Packages.qtbase + sqlite xz boost ]; nativeBuildInputs = [ - libsForQt5.qmake + qt6Packages.qmake + cargo pkg-config - libsForQt5.wrapQtAppsHook + qt6Packages.wrapQtAppsHook + rustPlatform.cargoSetupHook ]; + cargoRoot = "internals"; + + env.HOST_AR = lib.getExe' stdenv.cc.bintools.bintools "ar"; + installFlags = [ "INSTALL_ROOT=$(out)" ]; meta = {