nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #13610 from NixOS/mergify/bp/2.29-maintenance/pr-13304

Browse source 
Fix overriding gtest with gmock (backport #13304)
This commit is contained in:
mergify[bot] 2025-07-31 02:11:52 +00:00 • committed by GitHub
commit 7b08e8d20e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -47,3 +47,6 @@ result-*
.DS_Store .DS_Store
flake-regressions flake-regressions
# direnv
.direnv/

4
src/libexpr-tests/meson.build
View file

@ -32,8 +32,8 @@ deps_private += rapidcheck
gtest = dependency('gtest') gtest = dependency('gtest')
deps_private += gtest deps_private += gtest
gtest = dependency('gmock') gmock = dependency('gmock')
deps_private += gtest deps_private += gmock
configdata = configuration_data() configdata = configuration_data()
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())