From 082b0b2619e7e6bae609d200dd398eabb02eccb8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 13 Oct 2019 14:40:24 -0400 Subject: [PATCH] gtk: reorganize This directory was mess of patches and hooks. Have a patches dir and a setup-hooks dir. --- pkgs/development/libraries/gtk/2.x.nix | 10 +++++----- pkgs/development/libraries/gtk/3.x.nix | 10 +++++----- .../libraries/gtk/{ => hooks}/drop-icon-theme-cache.sh | 0 .../gtk/{ => hooks}/gtk2-clean-immodules-cache.sh | 0 .../gtk/{ => hooks}/gtk3-clean-immodules-cache.sh | 0 .../01-build-Fix-path-handling-in-pkgconfig.patch | 0 .../libraries/gtk/{ => patches}/2.0-darwin-x11.patch | 0 .../gtk/{ => patches}/2.0-immodules.cache.patch | 0 .../libraries/gtk/{ => patches}/3.0-darwin-x11.patch | 0 .../gtk/{ => patches}/3.0-immodules.cache.patch | 0 .../libraries/gtk/{ => patches}/gtk2-theme-paths.patch | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/libraries/gtk/{ => hooks}/drop-icon-theme-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => hooks}/gtk2-clean-immodules-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => hooks}/gtk3-clean-immodules-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => patches}/01-build-Fix-path-handling-in-pkgconfig.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/2.0-darwin-x11.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/2.0-immodules.cache.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/3.0-darwin-x11.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/3.0-immodules.cache.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/gtk2-theme-paths.patch (100%) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 8bef9d92f5f..4286d6a73fb 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -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; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 4a7cf07d2e6..0e4fddaa010 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -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 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 = [ diff --git a/pkgs/development/libraries/gtk/drop-icon-theme-cache.sh b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/drop-icon-theme-cache.sh rename to pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh diff --git a/pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh rename to pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh rename to pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch rename to pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/2.0-darwin-x11.patch rename to pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/2.0-immodules.cache.patch rename to pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/3.0-darwin-x11.patch rename to pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/3.0-immodules.cache.patch rename to pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch similarity index 100% rename from pkgs/development/libraries/gtk/gtk2-theme-paths.patch rename to pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch