diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-13 19:17:00 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 19:17:00 -0600 |
commit | 73951bc0c8c02fabe97e645838a52a12618dcd8f (patch) | |
tree | ff4e31068bad8bed19dd69301cf812c77d9bd532 /pkgs/servers | |
parent | daf3297cb46f73522d021e22c4dc7e0eb6920333 (diff) | |
parent | 83d02fad5f9e2117309d00eeb3b99f355523c917 (diff) | |
download | nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar.gz nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar.bz2 nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar.lz nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar.xz nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.tar.zst nixlib-73951bc0c8c02fabe97e645838a52a12618dcd8f.zip |
Merge pull request #50293 from matthewbauer/cleanups2
Add setup-hooks for scons and waf
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/gpsd/default.nix | 28 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 44 | ||||
-rw-r--r-- | pkgs/servers/rippled/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 8 |
4 files changed, 40 insertions, 48 deletions
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 6e270192063b..f205b600dd95 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -44,30 +44,30 @@ stdenv.mkDerivation rec { # - leapfetch=no disables going online at build time to fetch leap-seconds # info. See <gpsd-src>/build.txt for more info. - buildPhase = '' + preBuild = '' patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct - scons \ - -j $NIX_BUILD_CORES \ - prefix="$out" \ - leapfetch=no \ - gpsd_user=${gpsdUser} \ - gpsd_group=${gpsdGroup} \ - systemd=yes \ - udevdir="$out/lib/udev" \ - python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" + + sconsFlags+=" udevdir=$out/lib/udev" + sconsFlags+=" python_libdir=$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; - checkPhase = '' + sconsFlags = [ + "leapfetch=no" + "gpsd_user=${gpsdUser}" + "gpsd_group=${gpsdGroup}" + "systemd=yes" + ]; + + preCheck = '' export LD_LIBRARY_PATH="$PWD" - scons check ''; # TODO: the udev rules file and the hotplug script need fixes to work on NixOS - installPhase = '' + preInstall = '' mkdir -p "$out/lib/udev/rules.d" - scons install udev-install ''; + installTargets = "install udev-install"; postFixup = '' wrapPythonProgramsIn $out/bin "$out $pythonPath" diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index c62ade1a20bb..55b4b641d153 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -20,25 +20,6 @@ let version = "3.4.10"; "yaml" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; - buildInputs = [ - sasl boost gperftools pcre-cpp snappy - zlib libyamlcpp sasl openssl.dev openssl.out libpcap - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - other-args = concatStringsSep " " ([ - "--ssl" - #"--rocksdb" # Don't have this packaged yet - "--wiredtiger=${if stdenv.is64bit then "on" else "off"}" - "--js-engine=mozjs" - "--use-sasl-client" - "--disable-warnings-as-errors" - "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld - "CC=$CC" - "CXX=$CXX" - "CCFLAGS=\"${concatStringsSep " " (map (input: "-I${input}/include") buildInputs)}\"" - "LINKFLAGS=\"${concatStringsSep " " (map (input: "-L${input}/lib") buildInputs)}\"" - ] ++ map (lib: "--use-system-${lib}") system-libraries); - in stdenv.mkDerivation rec { name = "mongodb-${version}"; @@ -48,7 +29,10 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ scons ]; - inherit buildInputs; + buildInputs = [ + sasl boost gperftools pcre-cpp snappy + zlib libyamlcpp sasl openssl.dev openssl.out libpcap + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; patches = [ @@ -83,14 +67,26 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; - buildPhase = '' - scons -j $NIX_BUILD_CORES core --release ${other-args} + sconsFlags = [ + "--release" + "--ssl" + #"--rocksdb" # Don't have this packaged yet + "--wiredtiger=${if stdenv.is64bit then "on" else "off"}" + "--js-engine=mozjs" + "--use-sasl-client" + "--disable-warnings-as-errors" + "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld + ] ++ map (lib: "--use-system-${lib}") system-libraries; + + preBuild = '' + sconsFlags+=" CC=$CC" + sconsFlags+=" CXX=$CXX" ''; - installPhase = '' + preInstall = '' mkdir -p $out/lib - scons -j $NIX_BUILD_CORES install --release --prefix=$out ${other-args} ''; + prefixKey = "--prefix="; enableParallelBuilding = true; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index c1d9655ef23a..af25da7ae458 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons openssl protobuf boost zlib ]; + nativeBuildInputs = [ pkgconfig scons ]; + buildInputs = [ openssl protobuf boost zlib ]; - buildPhase = "scons"; - - installPhase = '' + postInstall = '' mkdir -p $out/bin cp build/rippled $out/bin/ ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d2a4406a9730..6415fc95437e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -233,7 +233,7 @@ galera = stdenv.mkDerivation rec { buildInputs = [ asio boost check openssl scons ]; - patchPhase = '' + postPatch = '' substituteInPlace SConstruct \ --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" ''; @@ -243,11 +243,9 @@ galera = stdenv.mkDerivation rec { export LIBPATH="${galeraLibs}/lib" ''; - buildPhase = '' - scons -j$NIX_BUILD_CORES ssl=1 system_asio=1 strict_build_flags=0 - ''; + sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; - installPhase = '' + postInstall = '' # copied with modifications from scripts/packages/freebsd.sh GALERA_LICENSE_DIR="$share/licenses/${name}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} |