From 1c5056a7d765eeac5de5f04ea8370eae8ad34b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 3 Jun 2009 21:21:10 +0000 Subject: [PATCH] Updating the xkeyboard_config patch for esperanto with alt_gr svn path=/nixpkgs/trunk/; revision=15848 --- pkgs/data/misc/xkeyboard-config/default.nix | 2 ++ pkgs/data/misc/xkeyboard-config/eo.patch | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 9e5b9f9e4d8..4fb3a68f5d1 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { buildInputs = [perl perlXMLParser xkbcomp gettext intltool]; + patches = [ ./eo.patch ]; + ICONV = "iconv"; preConfigure = '' diff --git a/pkgs/data/misc/xkeyboard-config/eo.patch b/pkgs/data/misc/xkeyboard-config/eo.patch index 3709d110917..f288a5c0f6d 100644 --- a/pkgs/data/misc/xkeyboard-config/eo.patch +++ b/pkgs/data/misc/xkeyboard-config/eo.patch @@ -1,15 +1,3 @@ -diff --git a/rules/base.lst b/rules/base.lst -index 7004bcd..804f9f0 100644 ---- a/rules/base.lst -+++ b/rules/base.lst -@@ -168,6 +168,7 @@ - nl Netherlands - bt Bhutan - ee Estonia -+ eo Esperanto - ir Iran - iq Iraq - fo Faroe Islands diff --git a/rules/base.xml.in b/rules/base.xml.in index ec321f8..e9c3546 100644 --- a/rules/base.xml.in