From 1ee6cafaa00fd6a829c5500a75f820e32d3b0c4e Mon Sep 17 00:00:00 2001 From: omg Date: Fri, 2 Oct 2020 18:25:22 +0400 Subject: [PATCH 1/2] maintainers: add omgbebebe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c73e499c26b..f4547e9ed3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6451,6 +6451,12 @@ githubId = 167209; name = "Masanori Ogino"; }; + omgbebebe = { + email = "omgbebebe@gmail.com"; + github = "omgbebebe"; + githubId = 588167; + name = "Sergey Bubnov"; + }; omnipotententity = { email = "omnipotententity@gmail.com"; github = "omnipotententity"; From 6cb2d3f9ddaf5af53178c26d3f26bc70dfe3f4fe Mon Sep 17 00:00:00 2001 From: omg Date: Fri, 2 Oct 2020 18:23:34 +0400 Subject: [PATCH 2/2] photoflare: init at 1.6.5 --- .../graphics/photoflare/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/graphics/photoflare/default.nix diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix new file mode 100644 index 00000000000..43b12c40d96 --- /dev/null +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +}: + +mkDerivation rec { + pname = "photoflare"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "PhotoFlare"; + repo = "photoflare"; + rev = "v${version}"; + sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase graphicsmagick ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; + homepage = "https://photoflare.io"; + maintainers = [ maintainers.omgbebebe ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb08f0ec578..ad233b5131d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22897,6 +22897,8 @@ in photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; + photoflow = callPackage ../applications/graphics/photoflow { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };