diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2023-08-02 13:09:30 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2023-08-03 16:34:45 +0000 |
| commit | a0a909fa9ecd2b74ef3933a6f9309d3922b37463 (patch) | |
| tree | c905b9ee865ed241f6d334ea186ead1d64ae0749 /pkgs/tools/audio | |
| parent | 775f21b9fdc1f2bb46518a575339fac8ff867959 (diff) | |
| download | nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar.gz nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar.bz2 nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar.lz nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar.xz nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.tar.zst nixpkgs-a0a909fa9ecd2b74ef3933a6f9309d3922b37463.zip | |
treewide: noop: replace every newly introduced `stdenv.mkDerivation rec` with a fixpoint over `finalAttrs`
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/picotts/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/audio/piper/default.nix | 13 |
2 files changed, 8 insertions, 11 deletions
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 ]; }; -} +}) |