Merge #70576: scylladb: fix build under sandboxing

This commit is contained in:
Vladimír Čunát 2019-10-09 16:56:13 +02:00
commit 3596c4c53c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 35 additions and 4 deletions

View File

@ -0,0 +1,28 @@
diff --git a/configure.py b/configure.py
index 25ca951ac..454140420 100755
--- a/configure.py
+++ b/configure.py
@@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp"
configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]])
-for line in open('/etc/os-release'):
- key, _, value = line.partition('=')
- value = value.strip().strip('"')
- if key == 'ID':
- os_ids = [value]
- if key == 'ID_LIKE':
- os_ids += value.split(' ')
+try:
+ for line in open('/etc/os-release'):
+ key, _, value = line.partition('=')
+ value = value.strip().strip('"')
+ if key == 'ID':
+ os_ids = [value]
+ if key == 'ID_LIKE':
+ os_ids += value.split(' ')
+except FileNotFoundError:
+ os_ids = ["linux"]
# distribution "internationalization", converting package names.

View File

@ -41,7 +41,7 @@ gcc8Stdenv.mkDerivation {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ ./seastar-configure-script-paths.patch ]; patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
@ -77,21 +77,24 @@ gcc8Stdenv.mkDerivation {
postPatch = '' postPatch = ''
patchShebangs ./configure.py patchShebangs ./configure.py
patchShebangs seastar/json/json2code.py
''; '';
configurePhase = '' configurePhase = ''
./configure.py --mode=release ./configure.py --mode=release
''; '';
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r * $out/ cp -r * $out/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra";
homepage = "https://scylladb.com"; homepage = "https://scylladb.com";
license = licenses.agpl3; license = licenses.agpl3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.farlion ]; maintainers = [ stdenv.lib.maintainers.farlion ];
broken = true; requiredSystemFeatures = [ "big-parallel" ];
}; };
} }

View File

@ -24498,8 +24498,8 @@ in
sct = callPackage ../tools/X11/sct {}; sct = callPackage ../tools/X11/sct {};
scylladb = callPackage ../servers/scylladb { scylladb = callPackage ../servers/scylladb {
thrift = thrift-0_10; thrift = thrift-0_10;
}; };
seafile-shared = callPackage ../misc/seafile-shared { }; seafile-shared = callPackage ../misc/seafile-shared { };