Unverified Commit 60963dd2 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

libheif: use absolute binary path in thumbnailer file (#427112)

parents b9fe052b aab4ae5d

pkgs/applications/misc/zathura/core/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # add support for more image formats

  env.GDK_PIXBUF_MODULE_FILE = gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

    extraLoaders = [

      libheif.out

      libheif.lib

      libjxl

      librsvg

      webp-pixbuf-loader

pkgs/by-name/eo/eog/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec { 
          libjxl

          librsvg

          webp-pixbuf-loader

          libheif.out

          libheif.lib

        ];

      }

    }"

pkgs/by-name/li/libheif/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec { 
    "out"

    "dev"

    "man"

    "lib"

  ];



  src = fetchFromGitHub {
@@ -57,7 +58,13 @@ stdenv.mkDerivation rec { 
  ];



  # Fix installation path for gdk-pixbuf module

  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";

  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "lib"}/${gdk-pixbuf.moduleDir}";



  postInstall = ''

    substituteInPlace $out/share/thumbnailers/heif.thumbnailer \

      --replace-fail "TryExec=heif-thumbnailer" "TryExec=$bin/bin/heif-thumbnailer" \

      --replace-fail "Exec=heif-thumbnailer" "Exec=$bin/bin/heif-thumbnailer"

  '';



  # Wrong include path in .cmake.  It's a bit difficult to patch because of special characters.

  postFixup = ''

pkgs/by-name/sh/shotwell/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { 
    export GDK_PIXBUF_MODULE_FILE="${

      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

        extraLoaders = [

          libheif.out

          libheif.lib

        ];

      }

    }"

pkgs/desktops/xfce/applications/ristretto/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { 
    export GDK_PIXBUF_MODULE_FILE="${

      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

        extraLoaders = [

          libheif.out

          libheif.lib

          libjxl

          librsvg

          webp-pixbuf-loader