colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrapGAppsHook: Flip inheritance relationship with wrapGAppsNoGuiHook

Browse Source
This commit is contained in:
Jan Tojnar 2024-04-26 23:19:12 +02:00
parent 4e02eae70e
commit 70cf3ecaae
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
View File

@ -3,7 +3,7 @@
, makeSetupHook
, makeWrapper
, gobject-introspection
, isGraphical ? true
, isGraphical ? false
, gtk3
, librsvg
, dconf

13
pkgs/top-level/all-packages.nix
View File

@ -1434,13 +1434,18 @@ with pkgs;
name = "find-xml-catalogs-hook";
} ../build-support/setup-hooks/find-xml-catalogs.sh;
wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook {
makeWrapper = makeBinaryWrapper;
wrapGAppsHook = wrapGAppsNoGuiHook.override {
isGraphical = true;
};
wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = __splicedPackages.gtk4; };
wrapGAppsHook4 = wrapGAppsNoGuiHook.override {
isGraphical = true;
gtk3 = __splicedPackages.gtk4;
};
wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; };
wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook {
makeWrapper = makeBinaryWrapper;
};
separateDebugInfo = makeSetupHook {
name = "separate-debug-info-hook";