From 1588db305ad8f3be179a47458e5754b38a3b1962 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 01:35:02 +0200 Subject: [PATCH] smartdeblur: unstable-2013-01-09 -> unstable-2018-10-29 qt4 -> qt5 --- .../graphics/smartdeblur/default.nix | 27 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index c82e22ae0ca8..00d41bf9b293 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,25 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }: +{ stdenv, lib, fetchFromGitHub, cmake, fftw +, qtbase, qmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "smartdeblur"; - version = "unstable-2013-01-09"; + version = "unstable-2018-10-29"; src = fetchFromGitHub { owner = "Y-Vladimir"; repo = "SmartDeblur"; - rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e"; - sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw="; + rev = "5af573c7048ac49ef68e638f3405d3a571b96a8b"; + sha256 = "151vdd5ld0clw0vgp0fvp2gp2ybwpx9g43dad9fvbvwkg60izs87"; }; - preConfigure = '' - cd src + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + buildInputs = [ qtbase fftw ]; + + installPhase = '' + runHook preInstall + + install -Dm755 ./SmartDeblur -t $out/bin + + runHook postInstall ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 fftw ]; - - cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; - meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3285d68fd517..8eabfde07030 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30281,7 +30281,7 @@ with pkgs; jre = openjdk11; }; - smartdeblur = callPackage ../applications/graphics/smartdeblur { }; + smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; snapper-gui = callPackage ../applications/misc/snapper-gui { };