Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 821ed09f382d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fe8f5586d595
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 17, 2020

  1. xournalpp: 1.0.19 → 1.0.20

    @sikmir
    sikmir committed Dec 17, 2020
    Copy the full SHA
    a5ec4f9 View commit details

  2. Merge pull request #107115 from sikmir/xournalpp 

    xournalpp: 1.0.19 → 1.0.20
    @Ma27
    Ma27 authored Dec 17, 2020
    Copy the full SHA
    fe8f558 View commit details
Showing with 4 additions and 6 deletions.
  1. +4 −6 pkgs/applications/graphics/xournalpp/default.nix
10 changes: 4 additions & 6 deletions pkgs/applications/graphics/xournalpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, cmake
, gettext
, wrapGAppsHook
, pkgconfig
, pkg-config

, glib
, gsettings-desktop-schemas
@@ -22,16 +22,16 @@

stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.0.19";
version = "1.0.20";

src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq";
sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k";
};

nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
buildInputs =
[ glib
gsettings-desktop-schemas
@@ -50,8 +50,6 @@ stdenv.mkDerivation rec {

hardeningDisable = [ "format" ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
homepage = "https://xournalpp.github.io/";