From 69b89979ba52709d5df17a6b728d796bd366aa2e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 11 Apr 2020 15:02:25 +0200
Subject: [PATCH] wrapGAppsHook: move to a separate file

---
 .../setup-hooks/wrap-gapps-hook/default.nix      | 16 ++++++++++++++++
 .../{ => wrap-gapps-hook}/wrap-gapps-hook.sh     |  0
 pkgs/top-level/all-packages.nix                  |  4 +---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
 rename pkgs/build-support/setup-hooks/{ => wrap-gapps-hook}/wrap-gapps-hook.sh (100%)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
new file mode 100644
index 000000000000..83e4cd93c197
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
@@ -0,0 +1,16 @@
+{ stdenv
+, lib
+, makeSetupHook
+, makeWrapper
+, gtk3
+, librsvg
+, dconf
+}:
+
+makeSetupHook {
+  deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [
+    gtk3
+    librsvg
+    makeWrapper
+  ];
+} ./wrap-gapps-hook.sh
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
rename to pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e397bf15562..7204ec17c553 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -502,9 +502,7 @@ in
 
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
-  wrapGAppsHook = makeSetupHook {
-    deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ];
-  } ../build-support/setup-hooks/wrap-gapps-hook.sh;
+  wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { };
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;