From 042afeeed8b11b841150bf691b9a776da2a7aa33 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 19 Oct 2004 12:15:22 +0000 Subject: work around Nix "logics" >-) svn path=/nixpkgs/trunk/; revision=1579 --- pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar | Bin 0 -> 615848 bytes pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh | 2 +- pkgs/stdenv/nix-linux-static/gnutar-static/default.nix | 2 +- pkgs/stdenv/nix-linux-static/gnutar-static/tar | Bin 615848 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar delete mode 100755 pkgs/stdenv/nix-linux-static/gnutar-static/tar (limited to 'pkgs') diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar b/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar new file mode 100755 index 0000000000000..a001a9c988408 Binary files /dev/null and b/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar differ diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh b/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh index 542594297f84a..42f0d6e16103e 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 2be241d102685..539fd73ffa4dd 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; } diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/tar b/pkgs/stdenv/nix-linux-static/gnutar-static/tar deleted file mode 100755 index a001a9c988408..0000000000000 Binary files a/pkgs/stdenv/nix-linux-static/gnutar-static/tar and /dev/null differ -- cgit 1.4.1