diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 00:13:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 00:13:28 +0200 |
| commit | 748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c (patch) | |
| tree | bfc265bfef261aa08efc2c31692bf04dd7cfa510 /pkgs/applications | |
| parent | 7b8c07fb8fa24f334679a42b76494c68d4286f39 (diff) | |
| parent | fb3df1c9f953e81aa33c37052e476828e4bd3857 (diff) | |
| download | nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar.gz nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar.bz2 nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar.lz nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar.xz nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.tar.zst nixpkgs-748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c.zip | |
Merge pull request #258272 from wegank/phototonic-exiv2
phototonic: refactor, add patch for exiv2 0.28
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/phototonic/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 5044e60161c..738f78cf347 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,18 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, qtbase, exiv2 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { - repo = "phototonic"; owner = "oferkv"; + repo = "phototonic"; rev = "v${version}"; - sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7"; + hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/phototonic/-/raw/fcfa17307ad8988750cc09200188c9365c2c0b79/exiv2-0.28.patch"; + hash = "sha256-EayJYM4qobUWosxV2Ylj+2eiyhk1jM8OfnFZDbVdGII="; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro @@ -20,9 +28,9 @@ mkDerivation rec { meta = with lib; { description = "An image viewer and organizer"; - homepage = "https://sourceforge.net/projects/phototonic/"; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://github.com/oferkv/phototonic"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } |