Merge pull request #56328 from matti-kariluoma/master

candle: init at 1.1
This commit is contained in:
Peter Hoeg 2019-03-11 10:45:46 +08:00 committed by GitHub
commit f4ffe5c951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 0 deletions

View File

@ -2875,6 +2875,11 @@
github = "matthiasbeyer";
name = "Matthias Beyer";
};
matti-kariluoma = {
email = "matti@kariluo.ma";
github = "matti-kariluoma";
name = "Matti Kariluoma";
};
maurer = {
email = "matthew.r.maurer+nix@gmail.com";
github = "maurer";

View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
stdenv.mkDerivation rec {
name = "candle-${version}";
version = "1.1";
src = fetchFromGitHub {
owner = "Denvi";
repo = "Candle";
rev = "v${version}";
sha256 = "1gpx08gdz8awbsj6lsczwgffp19z3q0r2fvm72a73qd9az29pmm0";
};
nativeBuildInputs = [ qmake ];
sourceRoot = "source/src";
installPhase = ''
runHook preInstall
install -Dm755 Candle $out/bin/candle
runHook postInstall
'';
buildInputs = [ qtbase qtserialport ];
meta = with stdenv.lib; {
description = "GRBL controller application with G-Code visualizer written in Qt";
homepage = https://github.com/Denvi/Candle;
license = licenses.gpl3;
maintainers = with maintainers; [ matti-kariluoma ];
};
}

View File

@ -1109,6 +1109,8 @@ in
boost = pkgs.boost.override { python = python3; };
};
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
unicorn-emu = callPackage ../development/libraries/unicorn-emu { };