about summary refs log tree commit diff
path: root/pkgs/build-support/release/ant-build.nix
diff options
context:
space:
mode:
authorPetr Rockai <me@mornfall.net>2012-07-13 20:58:39 +0200
committerPeter Simons <simons@cryp.to>2012-07-23 20:33:04 +0200
commitce77a5ceec8d4f241bec049a3af9d9626b74b6dc (patch)
treeb9c87184f9645352f7333dd704d5c409018f2fc2 /pkgs/build-support/release/ant-build.nix
parent1eb5450bd4a60ac302f86d7609311c1c096b187f (diff)
downloadnixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar.gz
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar.bz2
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar.lz
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar.xz
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.tar.zst
nixlib-ce77a5ceec8d4f241bec049a3af9d9626b74b6dc.zip
Factor out repeated scriptlets from build-support/release/*.nix.
Diffstat (limited to 'pkgs/build-support/release/ant-build.nix')
-rw-r--r--pkgs/build-support/release/ant-build.nix9
1 files changed, 2 insertions, 7 deletions
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)
     ''; 
   }
 )