gtest: Add pkgconfig support #49310
Merged
gtest: Add pkgconfig support #49310
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you please rename commit message to |
|
I wonder why |
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, ninja, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "gtest-${version}";
version = "1.8.1";
@@ -10,24 +10,7 @@
sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
};
- buildInputs = [ cmake ];
-
- configurePhase = ''
- mkdir build
- cd build
- cmake ../ -DCMAKE_INSTALL_PREFIX=$out
- '';
-
- installPhase = ''
- mkdir -p $out/lib
- cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
- ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
- mkdir -p $out/include
- cp -v -r ../googlemock/include/gmock $out/include
- cp -v -r ../googletest/include/gtest $out/include
- mkdir -p $out/src
- cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
- '';
+ nativeBuildInputs = [ cmake ninja ];
meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests";
|
periklis
force-pushed
the
gtest-pkgconfig-support
branch
from
a6971bd
to
7fc03ce
Compare
|
@jtojnar Thanks for looking at the builder. It looked also strange to me, but i didn't dig deeper due to my narrow focus on having |
periklis
changed the title
jtojnar
reviewed
Oct 28, 2018
periklis
force-pushed
the
gtest-pkgconfig-support
branch
from
3c176bd
to
d89ed3b
Compare
|
@GrahamcOfBorg build gtest |
|
Success on x86_64-darwin (full log) Attempted: gtest Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gtest Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: gtest Partial log (click to expand)
|
9 tasks
orivej
added a commit
to orivej/nixpkgs
that referenced
this pull request
Nov 19, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Googletest generated some nice pkg-config files, which are cool for
pkg_check_moduleschecks.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)