ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use pkgconfig to find Nix

Browse Source
This commit is contained in:
Eelco Dolstra
2014-09-18 12:24:05 +02:00
parent c1bf3bb0f2
commit 4727165832
3 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
release.nix
View File

@ -37,7 +37,7 @@ in rec {
version = builtins.readFile ./version;
buildInputs =
[ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc git openssl ];
[ perl libxslt dblatex tetex nukeReferences pkgconfig nixUnstable git openssl ];
versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}";
@ -51,9 +51,7 @@ in rec {
'';
configureFlags =
[ "--with-nix=${nixUnstable}"
"--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook"
];
[ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
postDist = ''
make -C doc/manual install prefix="$out"
@ -128,10 +126,9 @@ in rec {
releaseTools.nixBuild {
name = "hydra";
src = tarball;
configureFlags = "--with-nix=${nix}";
buildInputs =
[ makeWrapper libtool unzip nukeReferences pkgconfig boehmgc sqlite
[ makeWrapper libtool unzip nukeReferences pkgconfig sqlite
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2
guile # optional, for Guile + Guix support
perlDeps perl