diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2022-02-16 13:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 13:31:43 +0100 |
| commit | 980ed8dd768d13dd020a4a7f96a9b55882bdae19 (patch) | |
| tree | a65b3e6ab0e13664395b210fae91cef2742330de | |
| parent | 6016f1c26c4ba404b836358d7bd236debe38bd52 (diff) | |
| parent | e98d8f7207250d4e8df3f3d1602a47c9d9c8c3a3 (diff) | |
| download | nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar.gz nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar.bz2 nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar.lz nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar.xz nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.tar.zst nixlib-980ed8dd768d13dd020a4a7f96a9b55882bdae19.zip | |
Merge pull request #155707 from 06kellyjac/feh
feh: correct license
| -rw-r--r-- | lib/licenses.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index aa3fa7c6e56f..b9310ef6c5b8 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -596,6 +596,11 @@ in mkLicense lset) ({ spdxId = "MIT"; fullName = "MIT License"; }; + # https://spdx.org/licenses/MIT-feh.html + mit-feh = { + spdxId = "MIT-feh"; + fullName = "feh License"; + }; mitAdvertising = { spdxId = "MIT-advertising"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 899495db9317..9c75742d52ba 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -3,8 +3,6 @@ , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: -with lib; - stdenv.mkDerivation rec { pname = "feh"; version = "3.8"; @@ -22,22 +20,24 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ optional stdenv.isDarwin "verscmp=0" - ++ optional enableAutoreload "inotify=1"; + ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${lib.makeBinPath [ libjpeg jpegexiforient ]}" \ --add-flags '--theme=feh' ''; checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; - meta = { + meta = with lib; { description = "A light-weight image viewer"; 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 ]; platforms = platforms.unix; }; |