Merge pull request #124030 from gebner/abseil202103241

abseil-cpp: 20200923.3 -> 20210324.1
This commit is contained in:
Gabriel Ebner 2021-05-22 19:18:03 +02:00 committed by GitHub
commit fc9a86afb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 17 deletions

View File

@ -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\

View File

@ -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"}"

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, abseil-cpp
, bzip2
@ -17,25 +16,16 @@
stdenv.mkDerivation rec {
pname = "or-tools";
version = "8.1";
version = "9.0";
disabled = python.pythonOlder "3.6"; # not supported upstream
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = "v${version}";
sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg";
sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3";
};
patches = [
# This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect
# USE_SCIP=OFF and then failing to find scip/scip.h
(fetchpatch {
url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch";
sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0";
})
];
# The original build system uses cmake which does things like pull
# in dependencies through git and Makefile creation time. We
# obviously don't want to do this so instead we provide the

View File

@ -32,7 +32,7 @@ let
nudb = fetchgit rec {
url = "https://github.com/CPPAlliance/NuDB.git";
rev = "2.0.5";
sha256 = "02zbd07qvdjjsm4ivvhxah5n466bncvm6m03vmq0qdbbrlnp6s37";
sha256 = "07dwvglhyzpqnhzd33a2vs80wrdxy55a3sirnd739xp1k5v8s2fx";
leaveDotGit = true;
fetchSubmodules = true;
postFetch = "cd $out && git tag ${rev}";
@ -41,7 +41,7 @@ let
rocksdb = fetchgit rec {
url = "https://github.com/facebook/rocksdb.git";
rev = "v6.7.3";
sha256 = "16qb636qs2yxqmz30hmvq8mllf038s80p37b0vyc0bazwlr93d9z";
sha256 = "0dzn5jg3i2mnnjj24dn9lzi3aajj5ga2akjf64lybyj481lq445k";
deepClone = true;
fetchSubmodules = false;
leaveDotGit = true;