Use pkgconfig to find Nix

[?]
Sep 18, 2014, 10:24 AM
KNLKTCDMQNYJ2Y4B7PDQ4WLZUSYKU4VV74YDCDJH5OBCYGP7W4VQC

Dependencies

  • [2] IEUOOHIN configure: Set the right $PATH for Nix.
  • [3] L7RW467Z Add a test for darcs inputs.
  • [4] D4MVPDFM nix's libs live in $out/lib now, not $out/nix/lib
  • [5] 7D6RFSAA Fix build for new nixUnstable
  • [6] A4SFSXJW libexpr's symbol table has changed
  • [7] M3A5PZIH hydra: Clarify the dependency on BDW-GC.
  • [8] WSCHBYEN add topgit to hydra's path
  • [9] V2ALOFRR Fix the test
  • [10] HJECG75O hydrA: add some pkgs to buildinputs for tests
  • [11] WYM574OI add nix to buildinputs
  • [12] T4LLYESZ * Nix expression for building Hydra.
  • [13] FV2M6MOT hydra: use autoconf/-make
  • [14] 6U6KBFYP Build the HTML manual; add the HTML & PDF to the distribution; install them.
  • [15] X5QBLQDG
  • [16] XCHBOA3S svn -> subversion
  • [17] QK2OXCKP hydra/release.nix: move manual to tarball build, restore version in store path for tarball build
  • [18] HX4QYOYA add first evaluations tests
  • [19] JUQJHSYJ release.nix: Add `--with-docbook-xsl' to the configure flags for `tarball'.
  • [20] MBEEIXWJ configure: Call the variable $NIX_STORE_PROGRAM, not $NIX_STORE.
  • [21] OEKXEMU2 hydra: Change the `tarball' job to use `--with-nix'.
  • [22] 6NWLMLSS remove nix from buildinputs
  • [23] XVBNSBNG configure: Make sure we get a recent `nix-store'.
  • [24] R6O64PAE Use a nicer version string
  • [25] WR6LRCAC oops, committed too much
  • [26] UHMUHQMU hydra: fix tarball build, add pre suffix to tarballs
  • [27] VOPKXPFE Add OpenSSL as a dependency because Nix needs it
  • [28] PIMGMGAF Rename hydra_eval_jobs to hydra-eval-jobs
  • [29] XDKFASXT Add bzip2 to buildInputs.
  • [30] 3PNG7NIB Remove trailing whitespace
  • [31] F57YJP5P Build against latest Nix
  • [32] 4C5F6SZV add openssl to deps
  • [33] KBONEPPH configure: Pass `-L/to/nix' as $LDFLAGS, not $LIBS.
  • [34] VM3TQZ65 * hydra: make manual.pdf
  • [35] LOHWNXEJ Cleanup
  • [36] YQWH4POV * Simplify.
  • [37] FJILMA6G configure: Preserve the user's $CPPFLAGS and $LDFLAGS.
  • [38] UMEQXUUH hydra: fix name of build jobset
  • [39] MIC2O6ZF Use evalFile() instead of parseExprFromFile()
  • [40] NDJ6PZB7 * Fix symbol to look for.
  • [41] FAIJDQKZ
  • [42] 2KJFOYGS hydra: Actually check for Nix in `configure'.
  • [43] U2BNO3C5 hydra: fix build job
  • [44] FSZJXAHR add sqlite to buildinputs
  • [45] QMW24O5S Add support for Guile & Guix.
  • [46] 6K5PBUUN Use buildEnv to combine Hydra's Perl dependencies

Change contents

  • edit in configure.ac at line 37
    [6.16262][6.16262:16382](),[6.16382][6.0:1](),[6.1][2.0:22](),[2.22][6.19:31](),[6.19][6.19:31]()
    AC_ARG_WITH(nix, AC_HELP_STRING([--with-nix=PATH],
    [prefix of nix]),
    nix=$withval, nix=/nix-missing)
    AC_SUBST(nix)
    PATH="$nix/bin:$PATH"
    export PATH
  • replacement in configure.ac at line 56
    [6.18][6.18:60]()
    old_CPPFLAGS="$CPPFLAGS"
    old_LIBS="$LIBS"
    [6.18]
    [6.60]
    PKG_CHECK_MODULES([NIX], [nix-main nix-expr nix-store])
  • edit in configure.ac at line 58
    [6.61][6.0:40](),[6.40][4.0:30](),[6.25][6.113:248](),[4.30][6.113:248](),[6.74][6.113:248](),[6.113][6.113:248](),[6.248][5.0:72](),[6.69][6.74:171](),[6.71][6.74:171](),[6.72][6.74:171](),[5.72][6.74:171](),[6.75][6.74:171](),[6.74][6.74:171](),[6.171][6.419:462](),[6.173][6.419:462](),[6.419][6.419:462](),[6.462][6.0:39]()
    CPPFLAGS="$CPPFLAGS -I$nix/include/nix"
    LDFLAGS="$LDFLAGS -L$nix/lib"
    AC_CHECK_HEADER([store-api.hh], [:],
    [AC_MSG_ERROR([Nix headers not found; please install Nix or check the `--with-nix' option.])])
    AC_CHECK_LIB([nixexpr], [_ZN3nix9EvalStateC1ERKSt4listISsSaISsEE], [:],
    [AC_MSG_ERROR([Nix library not found; please install Nix or check the `--with-nix' option.])])
    CPPFLAGS="$old_CPPFLAGS"
    LIBS="$old_LIBS"
    PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
  • replacement in release.nix at line 40
    [6.60][6.2:87]()
    [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc git openssl ];
    [6.60]
    [6.76]
    [ perl libxslt dblatex tetex nukeReferences pkgconfig nixUnstable git openssl ];
  • replacement in release.nix at line 54
    [6.23][6.73:111](),[6.111][6.53:126](),[6.53][6.53:126]()
    [ "--with-nix=${nixUnstable}"
    "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook"
    ];
    [6.23]
    [6.125]
    [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
  • edit in release.nix at line 129
    [6.774][6.65:109](),[6.65][6.65:109]()
    configureFlags = "--with-nix=${nix}";
  • replacement in release.nix at line 131
    [6.1780][6.1196:1272]()
    [ makeWrapper libtool unzip nukeReferences pkgconfig boehmgc sqlite
    [6.1780]
    [3.0]
    [ makeWrapper libtool unzip nukeReferences pkgconfig sqlite
  • replacement in src/c/Makefile.am at line 4
    [6.77][6.76:152]()
    hydra_eval_jobs_LDADD = -lnixmain -lnixexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
    [6.77]
    [6.286]
    hydra_eval_jobs_LDADD = $(NIX_LIBS)
  • replacement in src/c/Makefile.am at line 6
    [6.287][6.287:353]()
    AM_CXXFLAGS = \
    -I$(nix)/include/nix \
    $(BDW_GC_CFLAGS)
    [6.287]
    AM_CXXFLAGS = $(NIX_CFLAGS)