Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

all-packages: pass cxxStandard to or-tools

+8 -4
+1 -1
pkgs/development/libraries/abseil-cpp/default.nix
··· 30 30 cmakeFlags = [ 31 31 "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" 32 32 ] ++ lib.optionals (cxxStandard != null) [ 33 - "-DCMAKE_CXX_STANDARD=${toString cxxStandard}" 33 + "-DCMAKE_CXX_STANDARD=${cxxStandard}" 34 34 ]; 35 35 36 36 nativeBuildInputs = [ cmake ];
+1 -2
pkgs/development/libraries/grpc/default.nix
··· 59 59 "-DCMAKE_SKIP_BUILD_RPATH=OFF" 60 60 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 61 61 "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" 62 - ] ++ lib.optionals 63 - ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ 62 + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ 64 63 # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is 65 64 # only an issue with the useLLVM stdenv, not the darwin stdenv… 66 65 # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484
+6 -1
pkgs/top-level/all-packages.nix
··· 31181 31181 31182 31182 or-tools = callPackage ../development/libraries/science/math/or-tools { 31183 31183 python = python3; 31184 - abseil-cpp = abseil-cpp.override { static = true; }; 31184 + # or-tools builds with -std=c++17, so abseil-cpp must 31185 + # also be built that way 31186 + abseil-cpp = abseil-cpp.override { 31187 + static = true; 31188 + cxxStandard = "17"; 31189 + }; 31185 31190 }; 31186 31191 31187 31192 rubiks = callPackage ../development/libraries/science/math/rubiks { };