public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:55 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/pqiv/default.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config
, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
}:
stdenv.mkDerivation (rec {
@@ -14,14 +14,14 @@ stdenv.mkDerivation (rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ];
buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
prePatch = "patchShebangs .";
meta = with lib; {
description = "Powerful image viewer with minimal UI";
homepage = "http://www.pberndt.com/Programme/Linux/pqiv";
license = licenses.gpl3;
homepage = "https://www.pberndt.com/Programme/Linux/pqiv";
license = licenses.gpl3Plus;
maintainers = [];
platforms = platforms.linux;
};