From 5b9509bf00b4f24658dcbf6e0bbe3645ff5254cd Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 11 Jan 2026 22:55:00 +0300 Subject: [PATCH] libphonenumber: split outputs --- .../li/libphonenumber/cmake-include-dir.patch | 34 +++++++++++++++++++ pkgs/by-name/li/libphonenumber/package.nix | 7 ++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/by-name/li/libphonenumber/cmake-include-dir.patch diff --git a/pkgs/by-name/li/libphonenumber/cmake-include-dir.patch b/pkgs/by-name/li/libphonenumber/cmake-include-dir.patch new file mode 100644 index 000000000000..59de2beb6480 --- /dev/null +++ b/pkgs/by-name/li/libphonenumber/cmake-include-dir.patch @@ -0,0 +1,34 @@ +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -458,12 +458,12 @@ if (BUILD_STATIC_LIB) + # Build a static library (without -fPIC). + add_library (phonenumber STATIC ${SOURCES}) + target_link_libraries (phonenumber ${LIBRARY_DEPS}) +- target_include_directories(phonenumber PUBLIC $) ++ target_include_directories(phonenumber PUBLIC $) + + if (BUILD_GEOCODER) + add_library (geocoding STATIC ${GEOCODING_SOURCES}) + target_link_libraries (geocoding ${LIBRARY_DEPS}) +- target_include_directories(geocoding PUBLIC $) ++ target_include_directories(geocoding PUBLIC $) + add_dependencies (geocoding generate_geocoding_data) + add_dependencies (phonenumber generate_geocoding_data) + endif () +@@ -478,7 +478,7 @@ if (BUILD_SHARED_LIBS) + # Build a shared library (with -fPIC). + add_library (phonenumber-shared SHARED ${SOURCES}) + target_link_libraries (phonenumber-shared ${LIBRARY_DEPS}) +- target_include_directories(phonenumber-shared PUBLIC $) ++ target_include_directories(phonenumber-shared PUBLIC $) + + set_target_properties (phonenumber-shared + PROPERTIES +@@ -494,7 +494,7 @@ if (BUILD_SHARED_LIBS) + if (BUILD_GEOCODER) + add_library (geocoding-shared SHARED ${GEOCODING_SOURCES}) + target_link_libraries (geocoding-shared ${LIBRARY_DEPS}) +- target_include_directories(geocoding-shared PUBLIC $) ++ target_include_directories(geocoding-shared PUBLIC $) + add_dependencies (geocoding-shared generate_geocoding_data) + add_dependencies (phonenumber-shared generate_geocoding_data) \ No newline at end of file diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 47887927a754..e334b09f1232 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: { # An earlier version of this patch was submitted upstream but did not get # any interest there - https://github.com/google/libphonenumber/pull/2921 ./build-reproducibility.patch + # Fix include directory in generated cmake files with split outputs + ./cmake-include-dir.patch + ]; + + outputs = [ + "out" + "dev" ]; nativeBuildInputs = [