diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-21 23:18:09 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-21 23:18:09 +0000 |
| commit | 94d7d1fdbbb80718ff369389c1230ed77a4f7577 (patch) | |
| tree | e6b513aa6e9bf61bcabcbfdfe7cd8f0dd052893f /pkgs/development/libraries/libxklavier | |
| parent | 2a699fe5fb15cd68473f59d986059bdb92228b75 (diff) | |
| download | nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.gz nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.bz2 nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.lz nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.xz nixlib-94d7d1fdbbb80718ff369389c1230ed77a4f7577.tar.zst nixlib-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/libxklavier')
| -rw-r--r-- | pkgs/development/libraries/libxklavier/default.nix (renamed from pkgs/development/libraries/libxklavier/3.4.nix) | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libxklavier/3.4.nix b/pkgs/development/libraries/libxklavier/default.nix index 38fa91cfeb08..973d62467143 100644 --- a/pkgs/development/libraries/libxklavier/3.4.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,7 +1,7 @@ args: with args; stdenv.mkDerivation rec { - name = "libxklavier-" + version; + name = "libxklavier-3.4"; src = fetchurl { url = "mirror://sf/gswitchit/${name}.tar.gz"; @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile]; + buildInputs = [pkgconfig]; - configureFlags = "--enable-shared --disable-static + + configureFlags = '' --with-xkb-base=${xkeyboard_config}/etc/X11/xkb - --disable-xmodmap-support"; + --disable-xmodmap-support + ''; meta = { homepage = http://freedesktop.org/wiki/Software/LibXklavier; |