diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix index 62234651aa93..4e8ce95737d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch + (fetchpatch { + name = "fix-pkgconfig-paths.patch"; + url = "https://github.com/google/googletest/commit/5126ff48d9ac54828d1947d1423a5ef2a8efee3b.patch"; + sha256 = "sha256-TBvECU/9nuvwjsCjWJP2b6DNy+FYnHIFZeuVW7g++JE="; + }) ]; nativeBuildInputs = [ cmake ninja ]; |