diff options
| author | Jente Hidskes Ankarberg <jente@griffin.sh> | 2023-02-07 16:37:13 +0100 |
|---|---|---|
| committer | Jente Hidskes Ankarberg <jente@griffin.sh> | 2023-03-30 13:11:17 +0200 |
| commit | 79c547bb97e9b5a2d2565c0549d821c50b358156 (patch) | |
| tree | ef78a108af18c321dc212e1f4cb0e40f567e52af | |
| parent | b9a6bd815a5f2d8db82d0995086d7b4523b39e16 (diff) | |
| download | nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar.gz nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar.bz2 nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar.lz nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar.xz nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.tar.zst nixpkgs-79c547bb97e9b5a2d2565c0549d821c50b358156.zip | |
foundationdb: add pkg-config to help find libraries
| -rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/foundationdb/default.nix | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 3d1ef367875..c989f666898 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -2,6 +2,7 @@ { lib, fetchFromGitHub , cmake, ninja, boost, python3, openjdk, mono, libressl +, pkg-config , gccStdenv, llvmPackages , useClang ? false @@ -30,7 +31,7 @@ let }; buildInputs = [ libressl boost ]; - nativeBuildInputs = [ cmake ninja python3 openjdk mono ] + nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ] ++ lib.optionals useClang [ llvmPackages.lld ]; separateDebugInfo = true; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 3ca15ee6cc6..383efee182c 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -3,6 +3,7 @@ , cmake, ninja, which, findutils, m4, gawk , python2, python3, openjdk, mono, libressl, boost168 +, pkg-config }@args: let |