Merge pull request #101757 from magnetophon/geonkick

geonkick: 2.3.8 -> 2.4.0
This commit is contained in:
Mario Rodas 2020-10-27 06:51:53 -05:00 committed by GitHub
commit 2b0260f4bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions

View File

@ -1,14 +1,15 @@
{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }:
{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
, libjack2, lv2, libX11, cairo }:
stdenv.mkDerivation rec {
pname = "geonkick";
version = "2.3.8";
version = "2.4.0";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910";
sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj";
};
nativeBuildInputs = [ cmake pkg-config ];
@ -16,13 +17,16 @@ stdenv.mkDerivation rec {
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
# https://github.com/iurie-sw/geonkick/issues/120
cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
cmakeFlags = [
"-DGKICK_REDKITE_SDK_PATH=${redkite}"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = {
meta = with stdenv.lib; {
homepage = "https://gitlab.com/iurie-sw/geonkick";
description = "A free software percussion synthesizer";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.magnetophon ];
};
}

View File

@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
pname = "redkite";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "0bim1ifyslwvaf885klmf9hpszqq5k9bm2y4l7gcgl6cljfzi04y";
sha256 = "0c5k0a6ydb8szdgniqsva8l9j2sishlhsww13b3a9grvr7hb2bpq";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ cairo ];
meta = {
meta = with stdenv.lib; {
homepage = "https://gitlab.com/iurie-sw/redkite";
description = "A small GUI toolkit";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.magnetophon ];
};
}