pyrox.dev
Merge pull request #14731 from layus/fix-mongo
mongodb: forget references to build inputs
+11
-5
pkgs/servers/nosql/mongodb/default.nix
+11
-5
pkgs/servers/nosql/mongodb/default.nix
···
49
nativeBuildInputs = [ scons ];
50
inherit buildInputs;
51
52
-
# When not building with the system valgrind, the build should use the
53
-
# vendored header file - regardless of whether or not we're using the system
54
-
# tcmalloc - so we need to lift the include path manipulation out of the
55
-
# conditional.
56
patches =
57
-
[ ./valgrind-include.patch
58
(fetchpatch {
59
url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb;
60
name = "boost160.patch";
···
49
nativeBuildInputs = [ scons ];
50
inherit buildInputs;
51
52
patches =
53
+
[
54
+
# When not building with the system valgrind, the build should use the
55
+
# vendored header file - regardless of whether or not we're using the system
56
+
# tcmalloc - so we need to lift the include path manipulation out of the
57
+
# conditional.
58
+
./valgrind-include.patch
59
+
60
+
# MongoDB keeps track of its build parameters, which tricks nix into
61
+
# keeping dependencies to build inputs in the final output.
62
+
# We remove the build flags from buildInfo data.
63
+
./forget-build-dependencies.patch
64
(fetchpatch {
65
url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb;
66
name = "boost160.patch";
+17
pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
+17
pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
···
···
1
+
--- a/site_scons/mongo_scons_utils.py
2
+
+++ b/site_scons/mongo_scons_utils.py
3
+
@@ -84,14 +84,11 @@
4
+
def default_buildinfo_environment_data():
5
+
return (
6
+
('distmod', '$MONGO_DISTMOD', True, True,),
7
+
('distarch', '$MONGO_DISTARCH', True, True,),
8
+
('cc', '$CC_VERSION', True, False,),
9
+
- ('ccflags', '$CCFLAGS', True, False,),
10
+
('cxx', '$CXX_VERSION', True, False,),
11
+
- ('cxxflags', '$CXXFLAGS', True, False,),
12
+
- ('linkflags', '$LINKFLAGS', True, False,),
13
+
('target_arch', '$TARGET_ARCH', True, True,),
14
+
('target_os', '$TARGET_OS', True, False,),
15
+
)
16
+
17
+
# If you want buildInfo and --version to be relatively empty, set