Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 80e501491a7d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e8cf1234d77a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 11, 2020

  1. kdegraphics-thumbnailers: Add patch for thumbnail.so hang. 

    https://bugs.kde.org/show_bug.cgi?id=404652
https://phabricator.kde.org/D26635
(cherry picked from commit 57e6799)
    @ambrop72 @ttuegel
    ambrop72 authored and ttuegel committed May 11, 2020
    Copy the full SHA
    e8cf123 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/applications/kde/kdegraphics-thumbnailers.nix
10 changes: 9 additions & 1 deletion pkgs/applications/kde/kdegraphics-thumbnailers.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw
}:

@@ -9,6 +9,14 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
patches = [
# Fix a bug with thumbnail.so processes hanging:
# https://bugs.kde.org/show_bug.cgi?id=404652
(fetchpatch {
url = "https://phabricator.kde.org/file/data/tnk4b6roouixzifi6vre/PHID-FILE-qkkedevt7svx7lv56ea5/D26635.diff";
sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1";
})
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kio libkexiv2 libkdcraw ];
}