diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-01-03 10:13:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 10:13:31 +0100 |
| commit | 960c24a99604bab584ca111493d307875777952f (patch) | |
| tree | 055c8a7df78de7aaad90af9dbd380e560c6bafb4 /pkgs/development/web | |
| parent | 62bfa88763b08f85dea808d93e7a971dd8a2ce01 (diff) | |
| parent | db5d3cdfe20035a92106bb498c50e35274b1d1aa (diff) | |
| download | nixpkgs-960c24a99604bab584ca111493d307875777952f.tar nixpkgs-960c24a99604bab584ca111493d307875777952f.tar.gz nixpkgs-960c24a99604bab584ca111493d307875777952f.tar.bz2 nixpkgs-960c24a99604bab584ca111493d307875777952f.tar.lz nixpkgs-960c24a99604bab584ca111493d307875777952f.tar.xz nixpkgs-960c24a99604bab584ca111493d307875777952f.tar.zst nixpkgs-960c24a99604bab584ca111493d307875777952f.zip | |
Merge pull request #75798 from tobim/pkgsStatic/arrow
arrow-cpp: add pkgsStatic support
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/woff2/brotli-static.patch | 36 | ||||
| -rw-r--r-- | pkgs/development/web/woff2/default.nix | 16 |
2 files changed, 47 insertions, 5 deletions
diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/development/web/woff2/brotli-static.patch new file mode 100644 index 00000000000..4ed6d7e741a --- /dev/null +++ b/pkgs/development/web/woff2/brotli-static.patch @@ -0,0 +1,36 @@ +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 diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index b77184e5652..ff0484547fc 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,4 @@ -{ brotli, cmake, fetchFromGitHub, stdenv }: +{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }: stdenv.mkDerivation rec { pname = "woff2"; @@ -13,18 +13,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ cmake ]; + # Need to explicitly link to brotlicommon + patches = stdenv.lib.optional static ./brotli-static.patch; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] + ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; propagatedBuildInputs = [ brotli ]; - # without this binaries only get built if shared libs are disable - patchPhase = '' + postPatch = '' + # without this binaries only get built if shared libs are disable sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt ''; meta = with stdenv.lib; { description = "Webfont compression reference code"; - homepage = https://github.com/google/woff2; + homepage = "https://github.com/google/woff2"; license = licenses.mit; maintainers = [ maintainers.hrdinka ]; platforms = platforms.unix; |