From 32f80f808c30a229a220b2baf4d58242ba7901ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 30 Apr 2025 14:09:28 +0200 Subject: [PATCH] codec2: use split outputs -> out, lib, dev --- pkgs/by-name/co/codec2/package.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix index af167085d793..5eef7e5c577b 100644 --- a/pkgs/by-name/co/codec2/package.nix +++ b/pkgs/by-name/co/codec2/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { ./fix-pkg-config.patch ]; + outputs = [ + "out" + "lib" + "dev" + ]; + nativeBuildInputs = [ cmake buildPackages.stdenv.cc # needs to build a C program to run at build time @@ -46,10 +52,18 @@ stdenv.mkDerivation (finalAttrs: { install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ ''; - # Swap keyword order to satisfy SWIG parser - postFixup = '' - sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h - ''; + postFixup = + # Swap keyword order to satisfy SWIG parser + '' + sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h + '' + + + # generated cmake module is not compatible with multiple outputs + '' + substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \ + '"''${_IMPORT_PREFIX}/include/codec2' \ + "\"$dev/include/codec2" + ''; cmakeFlags = [