From a0a909fa9ecd2b74ef3933a6f9309d3922b37463 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 2 Aug 2023 13:09:30 +0000 Subject: treewide: noop: replace every newly introduced `stdenv.mkDerivation rec` with a fixpoint over `finalAttrs` --- pkgs/tools/audio/picotts/default.nix | 6 +++--- pkgs/tools/audio/piper/default.nix | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'pkgs/tools/audio') diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index d2ab0e09d3c..137fa838c62 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picotts"; version = "unstable-2018-10-19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libtool popt ]; - sourceRoot = "${src.name}/pico"; + sourceRoot = "${finalAttrs.src.name}/pico"; preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox"; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.canndrew ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index ed70eb4848f..d753d7bb3e1 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -16,21 +16,18 @@ , piper-train }: -let +stdenv.mkDerivation (finalAttrs: { pname = "piper"; version = "1.2.0"; -in -stdenv.mkDerivation rec { - inherit pname version; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; }; - sourceRoot = "${src.name}/src/cpp"; + sourceRoot = "${finalAttrs.src.name}/src/cpp"; nativeBuildInputs = [ cmake @@ -63,10 +60,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - changelog = "https://github.com/rhasspy/piper/releases/tag/v${version}"; + changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}"; description = "A fast, local neural text to speech system"; homepage = "https://github.com/rhasspy/piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; -} +}) -- cgit 1.4.1