Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rnote: unbreak darwin #356389

Merged
merged 2 commits into from
Nov 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 47 additions & 41 deletions pkgs/by-name/rn/rnote/package.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{ lib
, stdenv
, fetchFromGitHub
, alsa-lib
, appstream
, appstream-glib
, cargo
, cmake
, desktop-file-utils
, dos2unix
, glib
, gst_all_1
, gtk4
, libadwaita
, libxml2
, meson
, ninja
, pkg-config
, poppler
, python3
, rustPlatform
, rustc
, shared-mime-info
, wrapGAppsHook4
, darwin
{
lib,
stdenv,
fetchFromGitHub,
alsa-lib,
appstream,
appstream-glib,
cargo,
cmake,
desktop-file-utils,
dos2unix,
glib,
gst_all_1,
gtk4,
libadwaita,
libxml2,
meson,
ninja,
pkg-config,
poppler,
python3,
rustPlatform,
rustc,
shared-mime-info,
wrapGAppsHook4,
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -67,33 +67,39 @@ stdenv.mkDerivation rec {
(lib.mesonBool "cli" true)
];

buildInputs = [
appstream
glib
gst_all_1.gstreamer
gtk4
libadwaita
libxml2
poppler
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AudioUnit
];
buildInputs =
[
appstream
glib
gst_all_1.gstreamer
gtk4
libadwaita
libxml2
poppler
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
];

postPatch = ''
chmod +x build-aux/*.py
patchShebangs build-aux
'';

env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
};

meta = with lib; {
homepage = "https://github.com/flxzt/rnote";
changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}";
description = "Simple drawing application to create handwritten notes";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda gepbird yrd ];
maintainers = with maintainers; [
dotlambda
gepbird
yrd
];
platforms = platforms.unix;
# compiler error since 2023-11-17
broken = stdenv.hostPlatform.isDarwin;
};
}