Merge pull request from magnetophon/flameshot

flameshot: 0.6.0 -> 0.8.4
This commit is contained in:
Mario Rodas 2020-10-27 00:26:25 -05:00 committed by GitHub
commit e0fb9cccc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,44 +1,26 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }: { mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }:
# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages`
# in configuration.nix so that the daemon gets launched properly:
#
# services.dbus.packages = [ pkgs.flameshot ];
# environment.systemPackages = [ pkgs.flameshot ];
mkDerivation rec { mkDerivation rec {
pname = "flameshot"; pname = "flameshot";
version = "0.6.0"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lupoDharkael"; owner = "flameshot-org";
repo = "flameshot"; repo = "flameshot";
rev = "v${version}"; rev = "v${version}";
sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm"; sha256 = "0nr50ma8l612drl2br084kb3xac7jqkqr41b26d4p9y7ylwk05yq";
}; };
nativeBuildInputs = [ qmake qttools qtsvg ]; nativeBuildInputs = [ cmake qttools qtsvg ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
preConfigure = ''
# flameshot.pro assumes qmake is being run in a git checkout.
git() { echo ${version}; }
export -f git
'';
postFixup = ''
substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \
--replace "/usr/local" "$out"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Powerful yet simple to use screenshot software"; description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/lupoDharkael/flameshot"; homepage = "https://flameshot.js.org";
maintainers = [ maintainers.scode ]; maintainers = [ maintainers.scode ];
license = lib.licenses.gpl3; license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }