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

tree-wide: autorename gnome packages to use dashes

Browse Source
This commit is contained in:
Jan Tojnar
2018-02-25 17:41:16 +01:00
parent 20c5476a8b
commit a31d98f312
491 changed files with 1532 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }:
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "fcitx-rime-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
};
buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ];
buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ];
# cmake cannont automatically find our nonstandard brise install location
cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ];
pkgs/tools/inputmethods/ibus/default.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true
, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
assert withWayland -> wayland != null && libxkbcommon != null;
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
substituteInPlace data/dconf/Makefile.am --replace "dconf update" true
substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus
echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh
cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make .
cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
'';
preAutoreconf = "touch ChangeLog";
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
gconf
gtk_doc
gtk-doc
intltool
makeWrapper
pkgconfig
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
gtk2
gtk3
isocodes
json_glib
json-glib
libnotify
] ++ optionals withWayland [
libxkbcommon
pkgs/tools/inputmethods/ibus/wrapper.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, runCommand, makeWrapper, lndir
, dconf, hicolor_icon_theme, ibus, librsvg, plugins
, dconf, hicolor-icon-theme, ibus, librsvg, plugins
}:
let
@@ -7,7 +7,7 @@ let
env = {
buildInputs = [ ibus ] ++ plugins;
nativeBuildInputs = [ lndir makeWrapper ];
propagatedUserEnvPackages = [ hicolor_icon_theme ];
propagatedUserEnvPackages = [ hicolor-icon-theme ];
paths = [ ibus ] ++ plugins;
inherit (ibus) meta;
};
@@ -37,7 +37,7 @@ let
--set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
--suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
done
for prog in ibus-daemon; do
@@ -56,7 +56,7 @@ let
--set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
--suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
--add-flags "--cache=refresh"
done
'';