Skip to content

Commit

Permalink
use fetchpatch
Browse files Browse the repository at this point in the history
  • Loading branch information
AtnNn committed Oct 17, 2020
1 parent 70b79e8 commit b66df0d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 71 deletions.
8 changes: 6 additions & 2 deletions pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
{ stdenv, cmake, ninja, fetchFromGitHub }:
{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:

stdenv.mkDerivation rec {
pname = "gtest";
Expand All @@ -15,7 +15,11 @@ stdenv.mkDerivation rec {

patches = [
./fix-cmake-config-includedir.patch
./fix-pkgconfig-paths.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 ];
Expand Down
69 changes: 0 additions & 69 deletions pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch

This file was deleted.

0 comments on commit b66df0d

Please sign in to comment.