Unverified Commit b7c274d0 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

freedv: move overrides to package.nix (#485674)

parents af1d3ab1 48ba167c

pkgs/by-name/fr/freedv/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -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 { };