mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-09 06:23:36 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
diff a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
|
|
--- a/cmake/FindBrotliDec.cmake
|
|
+++ b/cmake/FindBrotliDec.cmake
|
|
@@ -18,10 +18,10 @@ find_path(BROTLIDEC_INCLUDE_DIRS
|
|
HINTS ${PC_BROTLIDEC_INCLUDEDIR}
|
|
)
|
|
|
|
-find_library(BROTLIDEC_LIBRARIES
|
|
- NAMES brotlidec
|
|
- HINTS ${PC_BROTLIDEC_LIBDIR}
|
|
-)
|
|
+if(NOT BUILD_SHARED_LIBS)
|
|
+ set(_S "STATIC_")
|
|
+endif()
|
|
+set(BROTLIDEC_LIBRARIES ${PC_BROTLIDEC_${_S}LIBRARIES})
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(BrotliDec
|
|
diff a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
|
|
--- a/cmake/FindBrotliEnc.cmake
|
|
+++ b/cmake/FindBrotliEnc.cmake
|
|
@@ -18,10 +18,10 @@ find_path(BROTLIENC_INCLUDE_DIRS
|
|
HINTS ${PC_BROTLIENC_INCLUDEDIR}
|
|
)
|
|
|
|
-find_library(BROTLIENC_LIBRARIES
|
|
- NAMES brotlienc
|
|
- HINTS ${PC_BROTLIENC_LIBDIR}
|
|
-)
|
|
+if(NOT BUILD_SHARED_LIBS)
|
|
+ set(_S "STATIC_")
|
|
+endif()
|
|
+set(BROTLIENC_LIBRARIES ${PC_BROTLIENC_${_S}LIBRARIES})
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(BrotliEnc
|