diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index cd4432b931fa..1f182654142c 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -15,6 +15,7 @@ gtksourceview5, lcms2, libadwaita, + libglycin, gst_all_1, desktop-file-utils, appstream-glib, @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { # We should eventually use a cargo vendor patch hook instead preConfigure = '' pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index a3588b6628a9..b8df7fcaba32 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -2,8 +2,6 @@ stdenv, lib, fetchurl, - replaceVars, - bubblewrap, cairo, cargo, gettext, @@ -32,14 +30,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw="; }; - patches = [ - # Fix paths in glycin library. - # Not actually needed for this package since we are only building loaders - # and this patch is relevant just to apps that use the loaders - # but apply it here to ensure the patch continues to apply. - finalAttrs.passthru.glycinPathsPatch - ]; - cargoVendorDir = "vendor"; nativeBuildInputs = [ @@ -84,10 +74,6 @@ stdenv.mkDerivation (finalAttrs: { attrPath = "glycin-loaders"; packageName = "glycin"; }; - - glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { - bwrap = "${bubblewrap}/bin/bwrap"; - }; }; meta = with lib; { diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-paths.patch similarity index 100% rename from pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch rename to pkgs/by-name/li/libglycin/fix-glycin-paths.patch diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 220d59e878a1..74f78c18fa7a 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -15,6 +15,8 @@ gtk4, gobject-introspection, gnome, + replaceVars, + bubblewrap, common-updater-scripts, _experimental-update-script-combinators, buildPackages, @@ -72,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "capi_docs" withIntrospection) ]; + postPatch = '' + patch -p2 < ${finalAttrs.passthru.glycinPathsPatch} + ''; + passthru = { updateScript = let @@ -100,6 +106,10 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + + glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; }; meta = { @@ -111,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus ]; maintainers = with lib.maintainers; [ normalcea ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ "glycin-1" diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index cf5a039ba465..a43aae827f4a 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -15,6 +15,7 @@ libadwaita, libgweather, libseccomp, + libglycin, glycin-loaders, gnome, common-updater-scripts, @@ -67,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index cc5f6b7c69b3..0678773dacd5 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -8,6 +8,7 @@ desktop-file-utils, fetchFromGitea, glib, + libglycin, glycin-loaders, gst_all_1, gtk4, @@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; preFixup = '' diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index edb440b1cab7..9bc4466f3252 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + libglycin, glycin-loaders, cargo, desktop-file-utils, @@ -34,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix paths in glycin library - glycin-loaders.passthru.glycinPathsPatch + libglycin.passthru.glycinPathsPatch ]; cargoVendorDir = "vendor";