From 94d7d1fdbbb80718ff369389c1230ed77a4f7577 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Apr 2009 23:18:09 +0000
Subject: * 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
---
 pkgs/development/libraries/libxklavier/3.4.nix     | 21 -------------------
 pkgs/development/libraries/libxklavier/default.nix | 24 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/libxklavier/3.4.nix
 create mode 100644 pkgs/development/libraries/libxklavier/default.nix

(limited to 'pkgs/development/libraries/libxklavier')

diff --git a/pkgs/development/libraries/libxklavier/3.4.nix b/pkgs/development/libraries/libxklavier/3.4.nix
deleted file mode 100644
index 38fa91cfeb080..0000000000000
--- a/pkgs/development/libraries/libxklavier/3.4.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "libxklavier-" + version;
-
-  src = fetchurl {
-    url = "mirror://sf/gswitchit/${name}.tar.gz";
-    sha256 = "07pq74ygmnr3vgfp86dbjnqsp3v67fww6d3a1vqbif9wzbk70195";
-  };
-
-# TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
-  buildInputs = [pkgconfig];
-  configureFlags = "--enable-shared --disable-static
-    --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
-    --disable-xmodmap-support";
-
-  meta = {
-    homepage = http://freedesktop.org/wiki/Software/LibXklavier;
-  };
-}
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
new file mode 100644
index 0000000000000..973d62467143e
--- /dev/null
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -0,0 +1,24 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "libxklavier-3.4";
+
+  src = fetchurl {
+    url = "mirror://sf/gswitchit/${name}.tar.gz";
+    sha256 = "07pq74ygmnr3vgfp86dbjnqsp3v67fww6d3a1vqbif9wzbk70195";
+  };
+
+# TODO: enable xmodmap support, needs xmodmap DB
+  propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
+  
+  buildInputs = [pkgconfig];
+  
+  configureFlags = ''
+    --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
+    --disable-xmodmap-support
+  '';
+
+  meta = {
+    homepage = http://freedesktop.org/wiki/Software/LibXklavier;
+  };
+}
-- 
cgit 1.4.1