From 9328dc460d69cc1ee01078769877c646ffa975c0 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 16:14:03 +0000 Subject: [PATCH] watchman: use `finalAttrs` (cherry picked from commit 4f864948a8b40bbd964c521a433c972e67325330) (cherry picked from commit c7719feca73c120c165483a79b7c7f9eea208f90) --- pkgs/by-name/wa/watchman/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index f91f53389f58..7446ee777bed 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -31,14 +31,14 @@ darwinMinVersionHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "watchman"; version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cD8mIYCc+8Z2p3rwKVRFcW9sOBbpb5KHU5VpbXHMpeg="; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs "-DWATCHMAN_STATE_DIR=${stateDir}" - "-DWATCHMAN_VERSION_OVERRIDE=${version}" + "-DWATCHMAN_VERSION_OVERRIDE=${finalAttrs.version}" ]; nativeBuildInputs = [ @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock + cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock ''; meta = with lib; { @@ -109,4 +109,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.mit; }; -} +})