From b90209f3ded1954c364b4dd22ffa34c7f0478d0c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 1/4] llpp: remove unneeded configurePhase --- pkgs/applications/misc/llpp/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index d7db123ef4e3..68a5d7bac294 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { dontStrip = true; - configurePhase = '' - mkdir -p build/mupdf/thirdparty - ln -s ${freetype.dev} build/mupdf/thirdparty/freetype - ''; - buildPhase = '' bash ./build.bash build ''; From e531c99505df9b97b096ef75e4c5d2afa954875b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 2/4] llpp: fix license --- pkgs/applications/misc/llpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 68a5d7bac294..1239df38143e 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; + license = [ licenses.publicDomain licenses.bsd3 ]; }; } From 04b42d0e68561c0c7ef56367c975eb78324d2869 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 3/4] llpp: update homepage --- pkgs/applications/misc/llpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 1239df38143e..0b0267633eb8 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://repo.or.cz/w/llpp.git"; + homepage = "https://github.com/criticic/llpp"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; From 3a2c9f34999f2a4c5a020e0401cf9c30aec76e3a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 4/4] llpp: remove unused inputs --- pkgs/applications/misc/llpp/default.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 0b0267633eb8..03c1702b2073 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,26 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, -libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps, darwin }: +{ stdenv +, lib +, makeWrapper +, fetchFromGitHub +, ocaml +, pkg-config +, mupdf +, libX11 +, jbig2dec +, openjpeg +, libjpeg +, lcms2 +, harfbuzz +, libGLU +, libGL +, gumbo +, freetype +, zlib +, xclip +, inotify-tools +, procps +, darwin +}: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";