ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100873 from AtnNn/gtest

Browse Source
This commit is contained in:
Jan Tojnar 2020-10-18 13:16:24 +02:00 committed by GitHub
commit 7c4305be84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gtest/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, cmake, ninja, fetchFromGitHub }: { stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtest"; pname = "gtest";
@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./fix-cmake-config-includedir.patch ./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 ]; nativeBuildInputs = [ cmake ninja ];