diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2021-05-22 15:11:44 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2021-05-22 16:57:32 +0200 |
| commit | fc4f549d394b27e9ebbb5139711300d4ba586b57 (patch) | |
| tree | a171bba15a71e25a720f5c1f6833be70ad4068f6 /pkgs/development/libraries/abseil-cpp | |
| parent | fbe3209ba3bc6b18b9d2b2baa9e83feff9c68d62 (diff) | |
| download | nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar.gz nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar.bz2 nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar.lz nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar.xz nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.tar.zst nixpkgs-fc4f549d394b27e9ebbb5139711300d4ba586b57.zip | |
abseil-cpp: 20200923.3 -> 20210324.1
Diffstat (limited to 'pkgs/development/libraries/abseil-cpp')
| -rw-r--r-- | pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/abseil-cpp/default.nix | 15 |
2 files changed, 27 insertions, 3 deletions
diff --git a/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch b/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch new file mode 100644 index 00000000000..c18420711b9 --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake +index 1a80b5b..1fa57a7 100644 +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -171,8 +171,8 @@ function(absl_cc_library) + FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\ + prefix=${CMAKE_INSTALL_PREFIX}\n\ + exec_prefix=\${prefix}\n\ +-libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n\ +-includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n\ ++libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\ ++includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\ + \n\ + Name: absl_${_NAME}\n\ + Description: Abseil ${_NAME} library\n\ diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 0813a965524..a1610ce8262 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20200923.3"; + version = "20210324.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"; + sha256 = "16w63brfwgiayiyhvawsnr14xyy5hpp68k8fj0z6yk0bjzw6jvjw"; }; + patches = [ + # Use CMAKE_INSTALL_FULL_{LIBDIR,INCLUDEDIR} + # https://github.com/abseil/abseil-cpp/pull/963 + (fetchpatch { + url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch"; + sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5"; + }) + ]; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" |