From 042afeeed8b11b841150bf691b9a776da2a7aa33 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Oct 2004 12:15:22 +0000
Subject: [PATCH] work around Nix "logics" >-)

svn path=/nixpkgs/trunk/; revision=1579
---
 .../nix-linux-static/gnutar-static/{ => bin}/tar    | Bin
 .../nix-linux-static/gnutar-static/builder.sh       |   2 +-
 .../nix-linux-static/gnutar-static/default.nix      |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/stdenv/nix-linux-static/gnutar-static/{ => bin}/tar (100%)

diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/tar b/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar
similarity index 100%
rename from pkgs/stdenv/nix-linux-static/gnutar-static/tar
rename to pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar
diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh b/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh
index 542594297f84..42f0d6e16103 100644
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh
+++ b/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh
@@ -1,4 +1,4 @@
 . $stdenv/setup
  
 mkdir $out
-cp -a $src $out
+cp -a $src/* $out
diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix b/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix
index 2be241d10268..539fd73ffa4d 100644
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix
+++ b/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix
@@ -3,5 +3,5 @@
 stdenv.mkDerivation {
   name = "gnutar-static-1.13.25";
   builder = ./builder.sh;
-  src = ./tar;
+  src = ./bin;
 }