qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

package.nix: factor out the remaining dependency lists

Browse source 
Change-Id: Ie2ab8296d807da6a389017d316d9aae0285263bd
This commit is contained in:
Qyriad 2024-03-04 21:12:41 -07:00
parent b8622f351e
commit ee09e6d506
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
flake.nix
View file

@ -374,18 +374,15 @@
name = "nix-${version}"; name = "nix-${version}";
inherit version; inherit version;
src = nixSrc; inherit (comDeps.calledPackage)
VERSION_SUFFIX = versionSuffix; src
VERSION_SUFFIX
outputs = [ "out" "dev" "doc" ]; outputs
nativeBuildInputs
nativeBuildInputs = comDeps.nativeBuildDeps; buildInputs
buildInputs = comDeps.buildDeps propagatedBuildInputs
++ lib.optionals finalAttrs.doCheck comDeps.checkDeps; disallowedReferences
;
propagatedBuildInputs = comDeps.propagatedDeps;
disallowedReferences = [ boost ];
preConfigure = lib.optionalString (! currentStdenv.hostPlatform.isStatic) preConfigure = lib.optionalString (! currentStdenv.hostPlatform.isStatic)
'' ''

9
package.nix
View file

@ -124,7 +124,10 @@ in stdenv.mkDerivation (finalAttrs: {
++ 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
# TODO(Qyriad): Should this also have && (stdenv.isLinux || stdenv.isDarwin), as upstream does? # TODO(Qyriad): Should this also have && (stdenv.isLinux || stdenv.isDarwin), as upstream does?
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) aws-sdk-cpp-nix; ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) aws-sdk-cpp-nix
# FIXME(Qyriad): This is how the flake.nix version does it, but this is cursed.
++ lib.optionals (finalAttrs.doCheck or true) finalAttrs.checkInputs
;
checkInputs = [ checkInputs = [
gtest gtest
@ -136,6 +139,10 @@ in stdenv.mkDerivation (finalAttrs: {
nlohmann_json nlohmann_json
]; ];
disallowedReferences = [
boost
];
# FIXME: Used to make checkInputs accessible from outside the derivation args # FIXME: Used to make checkInputs accessible from outside the derivation args
# during the refactor. # during the refactor.
passthru.finalAttrs = finalAttrs; passthru.finalAttrs = finalAttrs;