diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch new file mode 100644 index 000000000000..9309495a4a93 --- /dev/null +++ b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch @@ -0,0 +1,31 @@ +From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 24 May 2025 16:20:51 +0200 +Subject: [PATCH] cmake: don't hardcode "include" as the includedir + +When the default CMAKE_INSTALL_INCLUDEDIR is changed +headers are installed to a different location, however, the +INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still +point to /include. + +Signed-off-by: Marcin Serwin +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07618fa..bdf2212 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,7 +91,7 @@ add_library(cubeb + src/cubeb_utils.cpp + ) + target_include_directories(cubeb +- PUBLIC $ $ ++ PUBLIC $ $ + ) + set_target_properties(cubeb PROPERTIES + VERSION ${cubeb_VERSION} +-- +2.49.0 + diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index d305471b51d4..0780f7630e09 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation { hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo="; }; + outputs = [ + "out" + "lib" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config @@ -51,6 +57,9 @@ stdenv.mkDerivation { patches = [ # https://github.com/mozilla/cubeb/pull/813 ./0001-cmake-add-pkg-config-file-generation.patch + + # https://github.com/mozilla/cubeb/pull/814 + ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch ]; cmakeFlags = [