diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/audio/cadence/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/audio/cadence/default.nix')
-rw-r--r-- | pkgs/applications/audio/cadence/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 4f4ad4b8c5b..62bf32eb71d 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,12 +1,11 @@ -{ stdenv +{ lib , a2jmidid , coreutils -, lib , libjack2 , fetchpatch , fetchzip , jack_capture -, pkgconfig +, pkg-config , pulseaudioFull , qtbase , makeWrapper @@ -32,6 +31,11 @@ mkDerivation rec { url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch"; sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8"; }) + # Fix build with Qt 5.15 + (fetchpatch { + url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch"; + sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh"; + }) ]; postPatch = '' @@ -43,7 +47,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ @@ -93,8 +97,8 @@ mkDerivation rec { meta = { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } |