public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added nc6, updated xkeyboard-config

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10574
This commit is contained in:
Yury G. Kudryashov 2008-02-10 17:35:57 +00:00
parent 7b9937f24d
commit 9f91384819
4 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/data/misc/xkeyboard-config/0.9.nix Normal file
View File

@ -0,0 +1,23 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-0.9";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
};
buildInputs = [perl perlXMLParser xkbcomp];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
'';
}

22
pkgs/data/misc/xkeyboard-config/1.2.nix Normal file
View File

@ -0,0 +1,22 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-${version}";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
};
buildInputs = [perl perlXMLParser xkbcomp gettext];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled || true;
cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
'';
}

2
pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
View File

@ -44,7 +44,7 @@ xkb_symbols "altgr-intl" {
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] }; key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, currency, sterling ] }; key <AE04> { [ 4, dollar, currency, sterling ] };
key <AE05> { [ 5, percent, EuroSign ] }; key <AE05> { [ 5, percent, EuroSign ] };
key <AE06> { [ 6, asciicircum, dead_circumflex ] }; key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
key <AE07> { [ 7, ampersand, dead_horn ] }; key <AE07> { [ 7, ampersand, dead_horn ] };
key <AE08> { [ 8, asterisk, dead_ogonek ] }; key <AE08> { [ 8, asterisk, dead_ogonek ] };
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] }; key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };

14
pkgs/top-level/all-packages.nix
View File

@ -3824,11 +3824,14 @@ rec {
inherit fetchurl stdenv cabextract; inherit fetchurl stdenv cabextract;
}; };
xkeyboard_config = import ../data/misc/xkeyboard-config { xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config ) {
inherit fetchurl stdenv perl perlXMLParser; inherit fetchurl stdenv perl perlXMLParser gettext;
inherit (xlibs) xkbcomp; inherit (xlibs) xkbcomp;
version = "1.2";
}; };
xkeyboard_config = xkeyboard_configFun null;
### APPLICATIONS ### APPLICATIONS
@ -5194,6 +5197,13 @@ rec {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed; inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
}; };
/*tetexX11 = import ../misc/tex/tetex {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm;
inherit freetype t1lib;
builderX11 = true;
};*/
texFunctions = import ../misc/tex/nix { texFunctions = import ../misc/tex/nix {
inherit stdenv perl tetex graphviz ghostscript; inherit stdenv perl tetex graphviz ghostscript;
}; };