diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-09-07 13:31:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 13:31:56 -0300 |
| commit | 7837fafa9500952ab4ead9e371f7e3f01cfca502 (patch) | |
| tree | 9e122bcbee2f791567d7e7088a369c836674b4dc /pkgs | |
| parent | 37102db7a3a1cea307b1e576c26e86819f639f8a (diff) | |
| parent | faed8ef36e8942eb6f3127a5071e64896d53c60c (diff) | |
Merge pull request #189755 from AndersonTorres/sioyek
sioyek: get rid of rec
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/sioyek/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 28 insertions, 12 deletions
diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 3ea7afcbdeb4..2dc82b55df7c 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -15,21 +15,34 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; version = "unstable-2022-08-30"; src = fetchFromGitHub { owner = "ahrm"; - repo = pname; + repo = "sioyek"; rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; }; - buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + buildInputs = [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt3d + qtbase + ] + ++ lib.optionals stdenv.isDarwin [ freetype ]; - nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; + nativeBuildInputs = [ + installShellFiles + qmake + wrapQtAppsHook + ]; qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; @@ -51,7 +64,7 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications cp -r sioyek.app $out/Applications - '' else '' + '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config @@ -59,11 +72,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Sioyek is a PDF viewer designed for reading research papers and technical books."; homepage = "https://sioyek.info/"; - changelog = "https://github.com/ahrm/sioyek/releases"; + description = "A PDF viewer designed for research papers and technical books"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.podocarp ]; + maintainers = with maintainers; [ podocarp ]; + platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isAarch64; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af5d2e99705e..54975fd0bbfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30769,7 +30769,9 @@ with pkgs; simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; + sioyek = callPackage ../applications/misc/sioyek { + inherit (libsForQt5) qmake qt3d qtbase wrapQtAppsHook; + }; siproxd = callPackage ../applications/networking/siproxd { }; |