diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-21 20:15:09 -0400 |
---|---|---|
committer | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-21 21:15:33 -0400 |
commit | 79d875ae7757af9a43248d89f746bc92947284dc (patch) | |
tree | ecf9ea9f4a1e8729d5fd31e44f9c56fd0d8f5759 /pkgs/build-support/release/binary-tarball.nix | |
parent | b0c75e811a6ad20f2f23f6392eae06a4d854c4dd (diff) | |
download | nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar.gz nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar.bz2 nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar.lz nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar.xz nixlib-79d875ae7757af9a43248d89f746bc92947284dc.tar.zst nixlib-79d875ae7757af9a43248d89f746bc92947284dc.zip |
releaseTools: no-op expression cleanup
No functional change, was just reading through these and cleaning/sanitizing them a bit while I'm here.
Diffstat (limited to 'pkgs/build-support/release/binary-tarball.nix')
-rw-r--r-- | pkgs/build-support/release/binary-tarball.nix | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index dad65a0e7eb3..168343c80821 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -51,29 +51,24 @@ stdenv.mkDerivation ( configureFlags="--prefix=$prefix $configureFlags" dontAddPrefix=1 prefix=$TMPDIR/inst$prefix - ''; # */ - + ''; doDist = true; - distPhase = - '' - mkdir -p $out/tarballs - tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . - ''; - - - finalPhase = - '' - for i in $out/tarballs/*; do - echo "file binary-dist $i" >> $out/nix-support/hydra-build-products - done + distPhase = '' + mkdir -p $out/tarballs + tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . + ''; - # Propagate the release name of the source tarball. This is - # to get nice package names in channels. - test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) - ''; + finalPhase = '' + for i in $out/tarballs/*; do + echo "file binary-dist $i" >> $out/nix-support/hydra-build-products + done + # Propagate the release name of the source tarball. This is + # to get nice package names in channels. + test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) + ''; meta = (if args ? meta then args.meta else {}) // { description = "Build of a generic binary distribution"; |