wrapGAppsHook: move to a separate file

wip/yesman
Jan Tojnar 4 years ago
parent 5717d9d2f7
commit 69b89979ba
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
  1. 16
      pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
  2. 0
      pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh
  3. 4
      pkgs/top-level/all-packages.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

@ -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;

Loading…
Cancel
Save