Merge pull request #88009 from JJJollyjim/redis-systemd-fixes
redis: handle changes to systemd support
This commit is contained in:
commit
1ccc512b39
|
@ -11,12 +11,11 @@ let
|
||||||
port ${toString cfg.port}
|
port ${toString cfg.port}
|
||||||
${condOption "bind" cfg.bind}
|
${condOption "bind" cfg.bind}
|
||||||
${condOption "unixsocket" cfg.unixSocket}
|
${condOption "unixsocket" cfg.unixSocket}
|
||||||
daemonize yes
|
daemonize no
|
||||||
supervised systemd
|
supervised systemd
|
||||||
loglevel ${cfg.logLevel}
|
loglevel ${cfg.logLevel}
|
||||||
logfile ${cfg.logfile}
|
logfile ${cfg.logfile}
|
||||||
syslog-enabled ${redisBool cfg.syslog}
|
syslog-enabled ${redisBool cfg.syslog}
|
||||||
pidfile /run/redis/redis.pid
|
|
||||||
databases ${toString cfg.databases}
|
databases ${toString cfg.databases}
|
||||||
${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
|
${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
|
||||||
dbfilename dump.rdb
|
dbfilename dump.rdb
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, lua, jemalloc, nixosTests }:
|
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "6.0.1";
|
version = "6.0.1";
|
||||||
|
@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
|
||||||
''}
|
''}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ lua ];
|
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd;
|
||||||
# More cross-compiling fixes.
|
# More cross-compiling fixes.
|
||||||
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
||||||
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
|
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
|
||||||
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
||||||
makeFlags = [ "PREFIX=$(out)" ]
|
makeFlags = [ "PREFIX=$(out)" ]
|
||||||
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ];
|
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
|
||||||
|
++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue