From b135329dc57ce6e91c67202afb1b2345ef96f47b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 18:24:19 +0000 Subject: treewide: random cleanups --- pkgs/build-support/release/binary-tarball.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/build-support/release') diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index f691b1bf735..dad65a0e7eb 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation ( postPhases = "finalPhase"; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system @@ -43,7 +43,7 @@ stdenv.mkDerivation ( if test -e $origSrc/nix-support/hydra-release-name; then releaseName=$(cat $origSrc/nix-support/hydra-release-name) fi - + installFlagsArray=(DESTDIR=$TMPDIR/inst) # Prefix hackery because of a bug in stdenv (it tries to `mkdir @@ -62,18 +62,18 @@ stdenv.mkDerivation ( 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 - + # 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"; -- cgit 1.4.1