diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/spatialite-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 4ea7de0b1a38..2708e49eb2b6 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_LDFLAGS = [ "-lsqlite3" ]; + meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = https://www.gaia-gis.it/fossil/spatialite-tools; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 00f679cfdac8..67e353868fd6 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -87,7 +87,7 @@ in releaseTools.nixBuild rec { }; buildInputs = - [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx + [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support perlDeps perl nix @@ -100,7 +100,7 @@ in releaseTools.nixBuild rec { gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; # adds a patch which ensures compatibility with the API of Nix 2.0. # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44, @@ -114,6 +114,8 @@ in releaseTools.nixBuild rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; + NIX_CFLAGS_COMPILE = [ "-pthread" ]; + shellHook = '' PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PERL5LIB=$(pwd)/src/lib:$PERL5LIB; |