From ce77a5ceec8d4f241bec049a3af9d9626b74b6dc Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 13 Jul 2012 20:58:39 +0200
Subject: Factor out repeated scriptlets from build-support/release/*.nix.

---
 pkgs/build-support/release/ant-build.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'pkgs/build-support/release/ant-build.nix')

diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index fe15f93a8fe2..696f179a2ed0 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -100,15 +100,10 @@ stdenv.mkDerivation (
     postHook = ''
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
+      . ${./functions.sh}
 
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
       origSrc=$src
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
-      fi
-
+      src=$(findTarballs $src | head -1)
     ''; 
   }
 )
-- 
cgit 1.4.1