max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 15:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11197 from NixOS/aws-sdk-cpp-like-nixpkgs

Browse source 
dependencies: Centralize aws-sdk-cpp and sync with Nixpkgs
This commit is contained in:
Robert Hensing 2024-07-27 03:30:39 +02:00 committed by GitHub
commit 04c20dc0c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
package.nix
View file

@ -216,7 +216,8 @@ in {
] ++ lib.optional stdenv.hostPlatform.isStatic unixtools.hexdump ] ++ lib.optional stdenv.hostPlatform.isStatic unixtools.hexdump
; ;
buildInputs = lib.optionals doBuild [ buildInputs = lib.optionals doBuild (
[
brotli brotli
bzip2 bzip2
curl curl
@ -237,16 +238,14 @@ in {
++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
# There have been issues building these dependencies # There have been issues building these dependencies
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
(aws-sdk-cpp.override { aws-sdk-cpp
apis = ["s3" "transfer"]; );
customMemoryManagement = false;
})
;
propagatedBuildInputs = [ propagatedBuildInputs = lib.optionals doBuild ([
boost boost
nlohmann_json nlohmann_json
] ++ lib.optional enableGC boehmgc; ] ++ lib.optional enableGC boehmgc
);
dontBuild = !attrs.doBuild; dontBuild = !attrs.doBuild;
doCheck = attrs.doCheck; doCheck = attrs.doCheck;

9
packaging/dependencies.nix
View file

@ -79,6 +79,15 @@ scope: {
inherit stdenv versionSuffix; inherit stdenv versionSuffix;
version = lib.fileContents ../.version + versionSuffix; version = lib.fileContents ../.version + versionSuffix;
aws-sdk-cpp = (pkgs.aws-sdk-cpp.override {
apis = [ "s3" "transfer" ];
customMemoryManagement = false;
}).overrideAttrs {
# only a stripped down version is built, which takes a lot less resources
# to build, so we don't need a "big-parallel" machine.
requiredSystemFeatures = [ ];
};
libseccomp = pkgs.libseccomp.overrideAttrs (_: rec { libseccomp = pkgs.libseccomp.overrideAttrs (_: rec {
version = "2.5.5"; version = "2.5.5";
src = pkgs.fetchurl { src = pkgs.fetchurl {

5
src/libstore/package.nix
View file

@ -66,10 +66,7 @@ mkMesonDerivation (finalAttrs: {
] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
# There have been issues building these dependencies # There have been issues building these dependencies
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
(aws-sdk-cpp.override { aws-sdk-cpp
apis = ["s3" "transfer"];
customMemoryManagement = false;
})
; ;
propagatedBuildInputs = [ propagatedBuildInputs = [