diff options
| author | Aaron Jheng <wentworth@outlook.com> | 2023-10-25 09:47:50 +0800 |
|---|---|---|
| committer | Aaron Jheng <wentworth@outlook.com> | 2023-10-25 09:47:50 +0800 |
| commit | d4aee7541fcbf539cf0a505536eae0c24bc4a0a6 (patch) | |
| tree | 7326b877e9c78cbc59c5384a13df177645999618 /pkgs/development/libraries/protobuf | |
| parent | 93ed1b44f022e586a9a0bbcd32468d62ad8412d2 (diff) | |
| download | nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar.gz nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar.bz2 nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar.lz nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar.xz nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.tar.zst nixpkgs-d4aee7541fcbf539cf0a505536eae0c24bc4a0a6.zip | |
protobuf: fix eval failures
Diffstat (limited to 'pkgs/development/libraries/protobuf')
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index adf271a6dc4..6b4d2a74e74 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -48,17 +48,13 @@ stdenv.mkDerivation (finalAttrs: { ./static-executables-have-no-rpath.patch ]; - nativeBuildInputs = - let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in - [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest |