From 55145845c6fc4fd9ee3d5016d036e486838b4324 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 01:03:09 +0200 Subject: [PATCH] vtfedit: use scopes as arguments, remove all-packages.nix override --- pkgs/by-name/vt/vtfedit/package.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix index f222b329cc13..525eaf3ec79a 100644 --- a/pkgs/by-name/vt/vtfedit/package.nix +++ b/pkgs/by-name/vt/vtfedit/package.nix @@ -7,10 +7,12 @@ copyDesktopItems, makeWrapper, - wine, + wineWowPackages, winetricks, }: - +let + wine = wineWowPackages.staging; +in stdenv.mkDerivation rec { pname = "vtfedit"; version = "1.3.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab11ab15070..37118fc0eca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7994,10 +7994,6 @@ with pkgs; gtkVersion = "4"; }; - vtfedit = callPackage ../by-name/vt/vtfedit/package.nix { - wine = wineWowPackages.staging; - }; - inherit (callPackage ../development/libraries/vtk { }) vtk_9_5; vtk = vtk_9_5;