From 70ab289cf683dc87dd8d0af58dadd9393cc61d85 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 12:49:23 +0000 Subject: [PATCH] folly: use `finalAttrs` (cherry picked from commit 77300534286faf02ec5a6513399e8db928e8028a) (cherry picked from commit 55793f0501ae04cc72ac31befe60140cf8146547) --- pkgs/by-name/fo/folly/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 8ceedfd73ba4..fe8ed68dc2c0 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -27,14 +27,14 @@ watchman, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folly"; version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-INvWTw27fmVbKQIT9ebdRGMCOIzpc/NepRN2EnKLJx0="; }; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { # patch prefix issues again # see https://github.com/NixOS/nixpkgs/issues/144170 postFixup = '' - substituteInPlace $dev/lib/cmake/${pname}/${pname}-targets-release.cmake \ + substituteInPlace $dev/lib/cmake/${finalAttrs.pname}/${finalAttrs.pname}-targets-release.cmake \ --replace '$'{_IMPORT_PREFIX}/lib/ $out/lib/ ''; @@ -128,4 +128,4 @@ stdenv.mkDerivation rec { pierreis ]; }; -} +})