gtk: reorganize

This directory was mess of patches and hooks.
Have a patches dir and a setup-hooks dir.
wip/yesman
worldofpeace 5 years ago
parent f03b26c134
commit 082b0b2619
  1. 10
      pkgs/development/libraries/gtk/2.x.nix
  2. 10
      pkgs/development/libraries/gtk/3.x.nix
  3. 0
      pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
  4. 0
      pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
  5. 0
      pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
  6. 0
      pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
  7. 0
      pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
  8. 0
      pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
  9. 0
      pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
  10. 0
      pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
  11. 0
      pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch

@ -26,21 +26,21 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
setupHooks = [
./gtk2-clean-immodules-cache.sh
./drop-icon-theme-cache.sh
./hooks/gtk2-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
];
nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ];
patches = [
./2.0-immodules.cache.patch
./gtk2-theme-paths.patch
./patches/2.0-immodules.cache.patch
./patches/gtk2-theme-paths.patch
] ++ optionals stdenv.isDarwin [
(fetchpatch {
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
})
./2.0-darwin-x11.patch
./patches/2.0-darwin-x11.patch
];
propagatedBuildInputs = with xorg;

@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
outputBin = "dev";
setupHooks = [
./gtk3-clean-immodules-cache.sh
./drop-icon-theme-cache.sh
./hooks/gtk3-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
];
src = fetchurl {
@ -60,19 +60,19 @@ stdenv.mkDerivation rec {
};
patches = [
./3.0-immodules.cache.patch
./patches/3.0-immodules.cache.patch
(fetchpatch {
name = "Xft-setting-fallback-compute-DPI-properly.patch";
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
./01-build-Fix-path-handling-in-pkgconfig.patch
./patches/01-build-Fix-path-handling-in-pkgconfig.patch
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it
# e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
./3.0-darwin-x11.patch
./patches/3.0-darwin-x11.patch
];
mesonFlags = [

Loading…
Cancel
Save