diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/inputmethods | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip | |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/interception-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/libkkc/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33fea9705acd..33c66fb7ff20 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, - libevdev, libudev }: + libevdev, udev }: let version = "0.1.1"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevdev libudev libyamlcpp ]; + buildInputs = [ libevdev udev libyamlcpp ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 0051be14ee7c..7311b09008b9 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , vala, gobjectIntrospection, intltool, python2Packages, glib , pkgconfig -, libgee, json_glib, marisa, libkkc-data +, libgee, json-glib, marisa, libkkc-data }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ marisa libkkc-data ]; enableParallelBuilding = true; - propagatedBuildInputs = [ libgee json_glib ]; + propagatedBuildInputs = [ libgee json-glib ]; postInstall = '' ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models |