Commit 618142c1 authored by K900's avatar K900
Browse files

sane-backends: cherry-pick fix for scanimage locking up on exit 

This takes installCheckPhase from hanging on probably 90% of attempts
to not hanging a single time over an hour or so of looped builds.
parent f29a3c52

pkgs/applications/graphics/sane/backends/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitLab,

  fetchpatch,

  runtimeShell,

  buildPackages,

  gettext,
@@ -52,6 +53,15 @@ stdenv.mkDerivation rec { 
    hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";

  };



  # Fix hangs in tests, hopefully

  # FIXME: remove in next release

  patches = [

    (fetchpatch {

      url = "https://gitlab.com/sane-project/backends/-/commit/8acc267d5f4049d8438456821137ae56e91baea9.patch";

      hash = "sha256-IyupDeH1MPvEBnGaUzBbCu106Gp7zXxlPGFAaiiINQI=";

    })

  ];



  postPatch = ''

    # Do not create lock dir in install phase

    sed -i '/^install-lockpath:/!b;n;c\       # pass' backend/Makefile.am