summary refs log tree commit diff
path: root/pkgs/development/libraries/liboil
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-04-21 23:18:09 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-04-21 23:18:09 +0000
commit94d7d1fdbbb80718ff369389c1230ed77a4f7577 (patch)
treee6b513aa6e9bf61bcabcbfdfe7cd8f0dd052893f /pkgs/development/libraries/liboil
parent2a699fe5fb15cd68473f59d986059bdb92228b75 (diff)
downloadnixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.gz
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.bz2
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.lz
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.xz
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.zst
nixpkgs-94d7d1fdbbb80718ff369389c1230ed77a4f7577.zip
* 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
Diffstat (limited to 'pkgs/development/libraries/liboil')
-rw-r--r--pkgs/development/libraries/liboil/0.3.13.nix19
-rw-r--r--pkgs/development/libraries/liboil/default.nix (renamed from pkgs/development/libraries/liboil/0.3.15.nix)6
2 files changed, 2 insertions, 23 deletions
diff --git a/pkgs/development/libraries/liboil/0.3.13.nix b/pkgs/development/libraries/liboil/0.3.13.nix
deleted file mode 100644
index b1425e454fb..00000000000
--- a/pkgs/development/libraries/liboil/0.3.13.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "liboil-" + version;
-
-  src = fetchurl {
-    url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0cndfz98zca40qc1d2waq1dkfx32yscbllbvlnlhjp4cjlkyh9qg";
-  };
-
-  configureFlags = "--enable-shared --disable-static";
-
-  buildInputs = [pkgconfig glib];
-
-  meta = {
-    homepage = http://liboil.freedesktop.org;
-    description = "A library of simple functions that are optimized for various CPUs";
-  };
-}
diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/default.nix
index b777a1195f9..1bfbb6bbff2 100644
--- a/pkgs/development/libraries/liboil/0.3.15.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -1,15 +1,13 @@
-args: with args;
+{stdenv, fetchurl, pkgconfig, glib}:
 
 stdenv.mkDerivation rec {
-  name = "liboil-" + version;
+  name = "liboil-0.3.15";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
     sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf";
   };
 
-  configureFlags = "--enable-shared --disable-static";
-
   buildInputs = [pkgconfig glib];
 
   meta = {