mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
[Backport release-24.11] rnote: unbreak darwin (#356748)
This commit is contained in:
commit
6468b28927
@ -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 {
|
||||
@ -67,7 +67,8 @@ stdenv.mkDerivation rec {
|
||||
(lib.mesonBool "cli" true)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
[
|
||||
appstream
|
||||
glib
|
||||
gst_all_1.gstreamer
|
||||
@ -75,10 +76,9 @@ stdenv.mkDerivation rec {
|
||||
libadwaita
|
||||
libxml2
|
||||
poppler
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AudioUnit
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -86,14 +86,20 @@ stdenv.mkDerivation rec {
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user