From 48ba167cd6042081308a458fa632fba1c6cd4ec2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 19:37:29 +0200 Subject: [PATCH] freedv: move overrides to package.nix --- pkgs/by-name/fr/freedv/package.nix | 5 +++-- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 67c0ea5413d74..f1c3cfb78e427 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -27,6 +27,7 @@ }: let + codec2' = codec2.override { freedvSupport = true; }; ebur128Src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; @@ -125,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - codec2 + codec2' libsamplerate libsndfile lpcnet @@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_NATIVE_AUDIO" (with stdenv.hostPlatform; isLinux || isDarwin)) ]; - env.NIX_CFLAGS_COMPILE = "-I${codec2.src}/src"; + env.NIX_CFLAGS_COMPILE = "-I${codec2'.src}/src"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa357ead5f9bc..257eddeab5bb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10285,12 +10285,6 @@ with pkgs; inherit buildPythonApplication; }; - freedv = callPackage ../by-name/fr/freedv/package.nix { - codec2 = codec2.override { - freedvSupport = true; - }; - }; - inherit ({ freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };