* Got rid of all --disable-static flags; they're redundant now.

* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235

4 files changed, 19 insertions, 22 deletions

diff --git a/pkgs/development/libraries/libarchive/2.4.11.nix b/pkgs/development/libraries/libarchive/2.4.11.nix
deleted file mode 100644
index e75d59ec18af..000000000000
--- a/pkgs/development/libraries/libarchive/2.4.11.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz" args
diff --git a/pkgs/development/libraries/libarchive/2.4.12.nix b/pkgs/development/libraries/libarchive/2.4.12.nix
deleted file mode 100644
index 9765ec61cd76..000000000000
--- a/pkgs/development/libraries/libarchive/2.4.12.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4" args
diff --git a/pkgs/development/libraries/libarchive/common.nix b/pkgs/development/libraries/libarchive/common.nix
deleted file mode 100644
index 9f031e4f2c21..000000000000
--- a/pkgs/development/libraries/libarchive/common.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-sha256: args: with args;
-stdenv.mkDerivation rec {
-	name = "libarchive-" + version;
-
-	src = fetchurl {
-		url = "${meta.homepage}/src/${name}.tar.gz";
-    inherit sha256;
-	};
-
-	propagatedBuildInputs = [zlib bzip2 e2fsprogs];
-  buildInputs = [sharutils];
-  configureFlags = "--enable-shared --disable-static";
-
-	meta = {
-		description = "A library for reading and writing streaming archives";
-    homepage = http://people.freebsd.org/~kientzle/libarchive;
-	};
-}
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
new file mode 100644
index 000000000000..744554c338f6
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -0,0 +1,19 @@
+{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}:
+
+stdenv.mkDerivation rec {
+  name = "libarchive-2.4.12";
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/${name}.tar.gz";
+    sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4";
+  };
+
+  propagatedBuildInputs = [zlib bzip2 e2fsprogs];
+  
+  buildInputs = [sharutils];
+  
+  meta = {
+    description = "A library for reading and writing streaming archives";
+    homepage = http://people.freebsd.org/~kientzle/libarchive;
+  };
+}