Unverified Commit 33255fd1 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #221519 from dotlambda/rnote-0.5.17 

rnote: 0.5.16 -> 0.5.17
parents 082474b1 cce8dfae

pkgs/applications/graphics/rnote/default.nix

+20 −10
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, alsa-lib

, appstream-glib

, clang

, cmake

, desktop-file-utils

, glib
@@ -19,34 +19,43 @@ 
, rustPlatform

, shared-mime-info

, wrapGAppsHook4

, AudioUnit

}:



stdenv.mkDerivation rec {

  pname = "rnote";

  version = "0.5.16";

  version = "0.5.17";



  src = fetchFromGitHub {

    owner = "flxzt";

    repo = "rnote";

    rev = "v${version}";

    hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU=";

    hash = "sha256-/crqcp0oCq1f/5hnYfIcuSUzF5GmiAh2lLhQh+IzP4o=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0=";

    hash = "sha256-sfsk67zTmVPPtohJcgQ/OoMPeoNTo/zGs3hdA1D9SwM=";

  };



  patches = [

    # https://github.com/flxzt/rnote/pull/569

    (fetchpatch {

      url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";

      hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";

    })

  ];



  nativeBuildInputs = [

    appstream-glib # For appstream-util

    clang

    cmake

    desktop-file-utils # For update-desktop-database

    meson

    ninja

    pkg-config

    python3 # For the postinstall script

    rustPlatform.bindgenHook

    rustPlatform.cargoSetupHook

    rustPlatform.rust.cargo

    rustPlatform.rust.rustc
@@ -57,17 +66,18 @@ stdenv.mkDerivation rec { 
  dontUseCmakeConfigure = true;



  buildInputs = [

    alsa-lib

    glib

    gstreamer

    gtk4

    libadwaita

    libxml2

    poppler

  ] ++ lib.optionals stdenv.isLinux [

    alsa-lib

  ] ++ lib.optionals stdenv.isDarwin [

    AudioUnit

  ];



  LIBCLANG_PATH = "${clang.cc.lib}/lib";



  postPatch = ''

    pushd build-aux

    chmod +x cargo_build.py meson_post_install.py
@@ -80,8 +90,8 @@ stdenv.mkDerivation rec { 
    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.gpl3Only;

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ dotlambda yrd ];

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -11717,6 +11717,7 @@ with pkgs; 














  rnote = callPackage ../applications/graphics/rnote {















    inherit (gst_all_1) gstreamer;













    inherit (darwin.apple_sdk.frameworks) AudioUnit;















  };





























  rnp = callPackage ../tools/security/rnp { };