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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-10 09:45:47 +02:00
parent 680b33fe37 f4d69ad1f2
commit 594a885912
309 changed files with 3648 additions and 2038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/feh/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "feh";
version = "3.6.3";
version = "3.7";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";
sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87";
};
outputs = [ "out" "man" "doc" ];
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;
};