diff options
author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2021-11-07 21:29:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-07 21:29:51 +0100 |
commit | fbdf78236a346f57f716fb66ed62e1993260c9e5 (patch) | |
tree | d8ad89d78673cf511a52ad329e014f76bc116641 /pkgs/applications/misc/fbreader/default.nix | |
parent | 3b61f5c4366408ffdffa485457e499867d778b96 (diff) |
pkgs/applications: rename name to pname&version part 1 (#144949)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/misc/fbreader/default.nix')
-rw-r--r-- | pkgs/applications/misc/fbreader/default.nix | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index c2347d5fbb8bc..c684d273bc75a 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,9 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config -, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, bzip2 +, curl +, expat +, fribidi +, libunibreak +, sqlite +, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" -, qt4, gtk2 -, AppKit, Cocoa +, qt4 +, gtk2 +, AppKit +, Cocoa }: with lib; @@ -16,7 +28,8 @@ assert uiTarget == "macosx" -> uiType == "cocoa"; # which is way to old and no longer in nixpkgs. stdenv.mkDerivation { - name = "fbreader-${uiType}-0.99.6"; + pname = "fbreader-${uiType}"; + version = "0.99.6"; src = fetchFromGitHub { owner = "geometer"; @@ -53,7 +66,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - bzip2 curl expat fribidi libunibreak sqlite zlib + bzip2 + curl + expat + fribidi + libunibreak + sqlite + zlib ] ++ optional (uiType == "qt4") qt4 ++ optional (uiType == "gtk") gtk2 @@ -68,7 +87,7 @@ stdenv.mkDerivation { homepage = "http://www.fbreader.org/"; license = licenses.gpl3; broken = stdenv.isDarwin # untested, might work - || uiType == "gtk"; # builds, but the result is unusable, hangs a lot + || uiType == "gtk"; # builds, but the result is unusable, hangs a lot platforms = platforms.unix; maintainers = [ maintainers.coroa ]; }; |