From d2392c7a2b84dd6efb66660786101f25afdcd800 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Fri, 27 Jun 2025 14:48:10 -0400
Subject: [PATCH] resholve: fix using Nix API with overlays

Before this change, if you used an overlay to override the version of
resholve that Nixpkgs uses, then Nixpkgs would sometimes use the new
version of resholve and sometimes use the previous version of resholve.
Specifically, pkgs.resholve would use the new version of resholve and
pkgs.resholve.writeScriptBin would use the previous version of resholve.

This change makes it so that if an overlay replaces pkgs.resholve, then
pkgs.resholve and pkgs.resholve.writeScriptBin will still use the same
version of resholve.

Fixes #418458.
---
 pkgs/development/misc/resholve/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix
index b995561a9c87..93df52f2b477 100644
--- a/pkgs/development/misc/resholve/default.nix
+++ b/pkgs/development/misc/resholve/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgsBuildHost,
+  resholve,
   ...
 }:
 
@@ -37,10 +38,10 @@ let
   callPackage = lib.callPackageWith (pkgsBuildHost // { python27 = python27'; });
   source = callPackage ./source.nix { };
   deps = callPackage ./deps.nix { };
-in
-rec {
   # not exposed in all-packages
   resholveBuildTimeOnly = removeKnownVulnerabilities resholve;
+in
+rec {
   # resholve itself
   resholve = (
     callPackage ./resholve.nix {