diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/release.nix b/release.nix index 5a5a1226fe2c..4269a3f76d8c 100644 --- a/release.nix +++ b/release.nix @@ -23,7 +23,7 @@ let inherit officialRelease; buildInputs = - [ curl bison flex perl libxml2 libxslt bzip2 + [ curl bison flex perl libxml2 libxslt bzip2 xz dblatex (dblatex.tex or tetex) nukeReferences pkgconfig sqlite libsodium docbook5 docbook5_xsl ] ++ lib.optional (!lib.inNixShell) git; @@ -36,7 +36,9 @@ let postUnpack = '' # Clean up when building from a working tree. - (cd $sourceRoot && (git ls-files -o | xargs -r rm -v)) + if [[ -d $sourceRoot/.git ]]; then + git -C $sourceRoot clean -fd + fi ''; preConfigure = '' @@ -81,7 +83,7 @@ let src = tarball; buildInputs = - [ curl perl bzip2 openssl pkgconfig sqlite boehmgc ] + [ curl perl bzip2 xz openssl pkgconfig sqlite boehmgc ] ++ lib.optional stdenv.isLinux libsodium; configureFlags = '' |