gtk: reorganize

This directory was mess of patches and hooks.
Have a patches dir and a setup-hooks dir.

+10 -10
pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
pkgs/development/libraries/gtk/2.0-darwin-x11.patch pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
pkgs/development/libraries/gtk/2.0-immodules.cache.patch pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
+5 -5
pkgs/development/libraries/gtk/2.x.nix
··· 26 26 enableParallelBuilding = true; 27 27 28 28 setupHooks = [ 29 - ./gtk2-clean-immodules-cache.sh 30 - ./drop-icon-theme-cache.sh 29 + ./hooks/gtk2-clean-immodules-cache.sh 30 + ./hooks/drop-icon-theme-cache.sh 31 31 ]; 32 32 33 33 nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ]; 34 34 35 35 patches = [ 36 - ./2.0-immodules.cache.patch 37 - ./gtk2-theme-paths.patch 36 + ./patches/2.0-immodules.cache.patch 37 + ./patches/gtk2-theme-paths.patch 38 38 ] ++ optionals stdenv.isDarwin [ 39 39 (fetchpatch { 40 40 url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; 41 41 sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; 42 42 }) 43 - ./2.0-darwin-x11.patch 43 + ./patches/2.0-darwin-x11.patch 44 44 ]; 45 45 46 46 propagatedBuildInputs = with xorg;
pkgs/development/libraries/gtk/3.0-darwin-x11.patch pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
pkgs/development/libraries/gtk/3.0-immodules.cache.patch pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
+5 -5
pkgs/development/libraries/gtk/3.x.nix
··· 50 50 outputBin = "dev"; 51 51 52 52 setupHooks = [ 53 - ./gtk3-clean-immodules-cache.sh 54 - ./drop-icon-theme-cache.sh 53 + ./hooks/gtk3-clean-immodules-cache.sh 54 + ./hooks/drop-icon-theme-cache.sh 55 55 ]; 56 56 57 57 src = fetchurl { ··· 60 60 }; 61 61 62 62 patches = [ 63 - ./3.0-immodules.cache.patch 63 + ./patches/3.0-immodules.cache.patch 64 64 (fetchpatch { 65 65 name = "Xft-setting-fallback-compute-DPI-properly.patch"; 66 66 url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; 67 67 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; 68 68 }) 69 69 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 70 - ./01-build-Fix-path-handling-in-pkgconfig.patch 70 + ./patches/01-build-Fix-path-handling-in-pkgconfig.patch 71 71 ] ++ optionals stdenv.isDarwin [ 72 72 # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin 73 73 # let’s drop that dependency in similar way to how other parts of the library do it 74 74 # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 75 - ./3.0-darwin-x11.patch 75 + ./patches/3.0-darwin-x11.patch 76 76 ]; 77 77 78 78 mesonFlags = [
pkgs/development/libraries/gtk/drop-icon-theme-cache.sh pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
pkgs/development/libraries/gtk/gtk2-theme-paths.patch pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch
pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh