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

Merge remote-tracking branch 'upstream/master' into wrapper-pname-support

Browse Source
This commit is contained in:
John Ericson
2019-11-24 17:25:07 +00:00
parent 9b090ccbca 195c263a81
commit d0d5136cce
5772 changed files with 168373 additions and 134383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/inputmethods/evdevremapkeys/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, python3Packages }:
let
pythonPackages = python3Packages;
in pythonPackages.buildPythonPackage rec {
name = "${pname}-0.1.0";
pname = "evdevremapkeys";
src = fetchFromGitHub {
owner = "philipl";
repo = pname;
rev = "68fb618b8142e1b45d7a1e19ea9a5a9bbb206144";
sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f";
};
propagatedBuildInputs = with pythonPackages; [
pyyaml
pyxdg
python-daemon
evdev
];
meta = with stdenv.lib; {
homepage = "https://github.com/philipl/evdevremapkeys";
description = "Daemon to remap events on linux input devices";
license = licenses.mit;
maintainers = [ maintainers.q3k ];
platforms = platforms.linux;
};
}
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+5
View File
@@ -39,6 +39,11 @@ in clangStdenv.mkDerivation rec {
url = "https://download.fcitx-im.org/fcitx-mozc/${name}";
sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca";
})
# https://github.com/google/mozc/pull/444 - fix for gcc8 STL
(fetchpatch {
url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
})
];
postPatch = ''
pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+8
View File
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
gnome3.adwaita-icon-theme ];
# Patch paths to `fcitx-remote`
prePatch = ''
for f in gtk{3,}/config_widget.c; do
substituteInPlace $f \
--replace 'EXEC_PREFIX "/bin/fcitx-remote"' '"${fcitx}/bin/fcitx-remote"'
done
'';
preFixup = ''
wrapProgram $out/bin/fcitx-config-gtk3 \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS";
pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
+42
View File
@@ -0,0 +1,42 @@
diff --git a/cmake/FindEnchant.cmake b/cmake/FindEnchant.cmake
index 7c182e6a..5537595e 100644
--- a/cmake/FindEnchant.cmake
+++ b/cmake/FindEnchant.cmake
@@ -16,7 +16,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
find_package(PkgConfig)
-pkg_check_modules(PC_ENCHANT enchant)
+pkg_check_modules(PC_ENCHANT enchant-2)
find_path(ENCHANT_INCLUDE_DIR
NAMES enchant.h
@@ -24,7 +24,7 @@ find_path(ENCHANT_INCLUDE_DIR
PATH_SUFFIXES "enchant")
find_library(ENCHANT_LIBRARIES
- NAMES enchant
+ NAMES enchant-2
HINTS ${PC_ENCHANT_LIBRARY_DIRS})
if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
@@ -39,7 +39,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
- #include <enchant/enchant.h>
+ #include <enchant-2/enchant.h>
EnchantBroker *enchant_broker_init();
char **enchant_dict_suggest(EnchantDict *dict, const char *str,
@@ -78,6 +78,10 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
endif()
+if(ENCHANT_API_COMPATIBLE)
+ set(ENCHANT_LIBRARY_FILENAME ${ENCHANT_LIBRARIES})
+endif(ENCHANT_API_COMPATIBLE)
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Enchant DEFAULT_MSG ENCHANT_LIBRARIES
ENCHANT_INCLUDE_DIR ENCHANT_API_COMPATIBLE)
pkgs/tools/inputmethods/fcitx/unwrapped.nix
+4 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant1, isocodes, icu, libpthreadstubs
, libxml2, enchant2, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
''
;
patches = [ ./find-enchant-lib.patch ];
postPatch = ''
substituteInPlace src/frontend/qt/CMakeLists.txt \
--replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
@@ -69,7 +71,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
buildInputs = [
xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
];
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+10 -2
View File
@@ -1,5 +1,5 @@
{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
, ibus, gtk2, zinnia, qt5, libxcb }:
{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
, protobuf, ibus, gtk2, zinnia, qt5, libxcb }:
let
japanese_usage_dictionary = fetchFromGitHub {
@@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec {
sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
};
patches = [
# https://github.com/google/mozc/pull/444 - fix for gcc8 STL
(fetchpatch {
url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
})
];
postUnpack = ''
rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus-typing-booster";
version = "2.6.4";
version = "2.7.0";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr";
sha256 = "1rd9dkjc9s15mxifcbr12944rsh8z66p0j6abh3iw8vkiylk674s";
};
patches = [ ./hunspell-dirs.patch ];
pkgs/tools/inputmethods/ibus/default.nix
+6 -3
View File
@@ -50,18 +50,19 @@ let
};
nativeBuildInputs = [ autoreconfHook ];
};
ucdVersion = "12.0.0";
ucdSrcs = {
NamesList = fetchurl {
url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt";
url = "https://www.unicode.org/Public/${ucdVersion}/ucd/NamesList.txt";
sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f";
};
Blocks = fetchurl {
url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt";
url = "https://www.unicode.org/Public/${ucdVersion}/ucd/Blocks.txt";
sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10";
};
};
ucd = stdenv.mkDerivation {
name = "ucd-12.0.0";
name = "ucd-${ucdVersion}";
dontUnpack = true;
installPhase = ''
mkdir $out
@@ -98,6 +99,8 @@ stdenv.mkDerivation rec {
})
];
outputs = [ "out" "dev" ];
postPatch = ''
echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh
cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
pkgs/tools/inputmethods/libinput-gestures/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper,
libinput, wmctrl, python3,
xdotool ? null,
coreutils, xdotool ? null,
extraUtilsPath ? lib.optional (xdotool != null) xdotool
}:
stdenv.mkDerivation rec {
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
rm "$out/bin/libinput-gestures-setup"
substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
chmod +x "$out/share/applications/libinput-gestures.desktop"
wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}"
wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}"
'';
meta = with stdenv.lib; {