Unverified Commit 5511dd3c authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #267999 from marsam/update-llpp 

llpp: 41 -> 42
parents 047f8ad6 13d1f9af

pkgs/applications/misc/llpp/default.nix

+8 −14
Original line number Diff line number Diff line 
{ 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 }:

libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps, darwin }:



assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";



stdenv.mkDerivation rec {

  pname = "llpp";

  version = "41";

  version = "42";



  src = fetchFromGitHub {

    owner = "criticic";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE=";

    hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU=";

  };



  patches = [

    (fetchpatch {

      name = "system-makedeps-and-ocaml5.patch";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b";

      hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik=";

    })

  ];



  postPatch = ''

    sed -i "2d;s/ver=.*/ver=${version}/" build.bash

  '';
@@ -29,7 +21,9 @@ stdenv.mkDerivation rec { 
  strictDeps = true;



  nativeBuildInputs = [ makeWrapper ocaml pkg-config ];

  buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];

  buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]

    ++ lib.optionals stdenv.isLinux [ libGLU libGL ]

    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ];



  dontStrip = true;
@@ -46,7 +40,7 @@ stdenv.mkDerivation rec { 
    install -d $out/bin

    install build/llpp $out/bin

    install misc/llpp.inotify $out/bin/llpp.inotify



  '' + lib.optionalString stdenv.isLinux ''

    wrapProgram $out/bin/llpp \

        --prefix PATH ":" "${xclip}/bin"
@@ -59,7 +53,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    homepage = "https://repo.or.cz/w/llpp.git";

    description = "A MuPDF based PDF pager written in OCaml";

    platforms = platforms.linux;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ pSub ];

    license = licenses.gpl3;

  };

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -33442,9 +33442,7 @@ with pkgs; 














  linuxsampler = callPackage ../applications/audio/linuxsampler { };



























  llpp = callPackage ../applications/misc/llpp {













    inherit (ocaml-ng.ocamlPackages_4_14) ocaml;













  };













  llpp = callPackage ../applications/misc/llpp { };





























  lls = callPackage ../applications/networking/lls { };