alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

feh: correct license

Browse source
This commit is contained in:
06kellyjac 2022-01-28 14:23:25 +00:00
parent 4cb2e26459
commit e98d8f7207
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/licenses.nix
View file

@ -586,6 +586,11 @@ in mkLicense lset) ({
spdxId = "MIT"; spdxId = "MIT";
fullName = "MIT License"; fullName = "MIT License";
}; };
# https://spdx.org/licenses/MIT-feh.html
mit-feh = {
spdxId = "MIT-feh";
fullName = "feh License";
};
mpl10 = { mpl10 = {
spdxId = "MPL-1.0"; spdxId = "MPL-1.0";

14
pkgs/applications/graphics/feh/default.nix
View file

@ -3,8 +3,6 @@
, curl, libexif, jpegexiforient, perl , curl, libexif, jpegexiforient, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }: , enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "feh"; pname = "feh";
version = "3.8"; version = "3.8";
@ -22,22 +20,24 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"PREFIX=${placeholder "out"}" "exif=1" "PREFIX=${placeholder "out"}" "exif=1"
] ++ optional stdenv.isDarwin "verscmp=0" ] ++ lib.optional stdenv.isDarwin "verscmp=0"
++ optional enableAutoreload "inotify=1"; ++ lib.optional enableAutoreload "inotify=1";
installTargets = [ "install" ]; installTargets = [ "install" ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ wrapProgram "$out/bin/feh" --prefix PATH : "${lib.makeBinPath [ libjpeg jpegexiforient ]}" \
--add-flags '--theme=feh' --add-flags '--theme=feh'
''; '';
checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ]));
doCheck = true; doCheck = true;
meta = { meta = with lib; {
description = "A light-weight image viewer"; description = "A light-weight image viewer";
homepage = "https://feh.finalrewind.org/"; homepage = "https://feh.finalrewind.org/";
license = licenses.mit; # released under a variant of the MIT license
# https://spdx.org/licenses/MIT-feh.html
license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ]; maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };