diff options
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/shared-mime-info/0.22.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/shared-mime-info/0.23.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/shared-mime-info/common.nix | 16 | ||||
-rw-r--r-- | pkgs/data/misc/shared-mime-info/default.nix | 12 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/0.9.nix | 23 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/1.2.nix | 22 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl | 2 |
7 files changed, 66 insertions, 13 deletions
diff --git a/pkgs/data/misc/shared-mime-info/0.22.nix b/pkgs/data/misc/shared-mime-info/0.22.nix new file mode 100644 index 00000000000..399b3296d38 --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/0.22.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr" args diff --git a/pkgs/data/misc/shared-mime-info/0.23.nix b/pkgs/data/misc/shared-mime-info/0.23.nix new file mode 100644 index 00000000000..38617dfe8e3 --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/0.23.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "080ny2vy00202hxcm7xm72j1zmyfs15dbsnqipwni6b2dg2am3q3" args diff --git a/pkgs/data/misc/shared-mime-info/common.nix b/pkgs/data/misc/shared-mime-info/common.nix new file mode 100644 index 00000000000..8c2ff363c6a --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/common.nix @@ -0,0 +1,16 @@ +hash: args: with args; + +stdenv.mkDerivation rec { + name = "shared-mime-info-" + version; + + src = fetchurl { + url = "http://freedesktop.org/~hadess/${name}.tar.bz2"; + sha256 = hash; + }; + + buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib]; + + meta = { + homepage = http://freedesktop.org/wiki/Software/shared-mime-info; + }; +} diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix deleted file mode 100644 index 0b82782d31d..00000000000 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gettext, libxml2, glib}: - -stdenv.mkDerivation { - name = "shared-mime-info-0.22"; - - src = fetchurl { - url = http://freedesktop.org/~hadess/shared-mime-info-0.22.tar.bz2; - sha256 = "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr"; - }; - - buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib]; -} diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix new file mode 100644 index 00000000000..c7c92cd6c27 --- /dev/null +++ b/pkgs/data/misc/xkeyboard-config/0.9.nix @@ -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 + ''; +} diff --git a/pkgs/data/misc/xkeyboard-config/1.2.nix b/pkgs/data/misc/xkeyboard-config/1.2.nix new file mode 100644 index 00000000000..de67b00baea --- /dev/null +++ b/pkgs/data/misc/xkeyboard-config/1.2.nix @@ -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 + ''; +} diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl index 6b7d263da7f..91d21f76143 100644 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl @@ -44,7 +44,7 @@ xkb_symbols "altgr-intl" { key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] }; key <AE04> { [ 4, dollar, currency, sterling ] }; 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 <AE08> { [ 8, asterisk, dead_ogonek ] }; key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] }; |