summary refs log tree commit diff
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2004-10-19 12:15:22 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2004-10-19 12:15:22 +0000
commit042afeeed8b11b841150bf691b9a776da2a7aa33 (patch)
tree8b68ef1e130a90d8432716639590d05f51f0cff8
parentd133b324c04258b112437998d2b346f672606aa3 (diff)
downloadnixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar.gz
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar.bz2
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar.lz
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar.xz
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.tar.zst
nixpkgs-042afeeed8b11b841150bf691b9a776da2a7aa33.zip
work around Nix "logics" >-)
svn path=/nixpkgs/trunk/; revision=1579
-rwxr-xr-xpkgs/stdenv/nix-linux-static/gnutar-static/bin/tar (renamed from pkgs/stdenv/nix-linux-static/gnutar-static/tar)bin615848 -> 615848 bytes
-rw-r--r--pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh2
-rw-r--r--pkgs/stdenv/nix-linux-static/gnutar-static/default.nix2
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/tar b/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar
index a001a9c9884..a001a9c9884 100755
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/tar
+++ b/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh b/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh
index 542594297f8..42f0d6e1610 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 2be241d1026..539fd73ffa4 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;
 }