···

       
1
       
1
       
-
       
{ lib

     

       
2
       
2
       
-
       
, stdenv

     

       
3
       
3
       
-
       
, fetchFromGitHub

     

       
4
       
4
       
-
       
, fetchpatch

     

       
5
       
5
       
-
       
, pkg-config

     

       
6
       
6
       
-
       
, bzip2

     

       
7
       
7
       
-
       
, curl

     

       
8
       
8
       
-
       
, expat

     

       
9
       
9
       
-
       
, fribidi

     

       
10
       
10
       
-
       
, libunibreak

     

       
11
       
11
       
-
       
, sqlite

     

       
12
       
12
       
-
       
, zlib

     

       
13
       
13
       
-
       
, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"

     

       
14
       
14
       
-
       
, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"

     

       
15
       
15
       
-
       
, qt4

     

       
16
       
16
       
-
       
, gtk2

     

       
17
       
17
       
-
       
, AppKit

     

       
18
       
18
       
-
       
, Cocoa

     

       
19
       
19
       
-
       
}:

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
with lib;

     

       
22
       
22
       
-
       


     

       
23
       
23
       
-
       
assert elem uiTarget [ "desktop" "macosx" ];

     

       
24
       
24
       
-
       
assert elem uiType [ "qt4" "gtk" "cocoa" ];

     

       
25
       
25
       
-
       
assert uiTarget == "macosx" -> uiType == "cocoa";

     

       
26
       
26
       
-
       


     

       
27
       
27
       
-
       
# Note: "qt" uiType option mentioned in ${src}/README.build is qt3,

     

       
28
       
28
       
-
       
# which is way to old and no longer in nixpkgs.

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
stdenv.mkDerivation {

     

       
31
       
31
       
-
       
  pname = "fbreader-${uiType}";

     

       
32
       
32
       
-
       
  version = "0.99.6";

     

       
33
       
33
       
-
       


     

       
34
       
34
       
-
       
  src = fetchFromGitHub {

     

       
35
       
35
       
-
       
    owner = "geometer";

     

       
36
       
36
       
-
       
    repo = "FBReader";

     

       
37
       
37
       
-
       
    rev = "9e608db14372ae580beae4976eec7241fa069e75";

     

       
38
       
38
       
-
       
    sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y";

     

       
39
       
39
       
-
       
  };

     

       
40
       
40
       
-
       


     

       
41
       
41
       
-
       
  patches = [

     

       
42
       
42
       
-
       
    ./typecheck.patch

     

       
43
       
43
       
-
       
    (fetchpatch {

     

       
44
       
44
       
-
       
      name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311

     

       
45
       
45
       
-
       
      url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff";

     

       
46
       
46
       
-
       
      sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg";

     

       
47
       
47
       
-
       
    })

     

       
48
       
48
       
-
       
  ];

     

       
49
       
49
       
-
       


     

       
50
       
50
       
-
       
  postPatch = ''

     

       
51
       
51
       
-
       
    cat << EOF > makefiles/target.mk

     

       
52
       
52
       
-
       
    TARGET_ARCH = ${uiTarget}

     

       
53
       
53
       
-
       
    TARGET_STATUS = release

     

       
54
       
54
       
-
       
    UI_TYPE = ${uiType}

     

       
55
       
55
       
-
       
    EOF

     

       
56
       
56
       
-
       


     

       
57
       
57
       
-
       
    substituteInPlace makefiles/arch/desktop.mk \

     

       
58
       
58
       
-
       
      --replace ccache "" \

     

       
59
       
59
       
-
       
      --replace moc-qt4 moc

     

       
60
       
60
       
-
       


     

       
61
       
61
       
-
       
    # libunibreak supersedes liblinebreak

     

       
62
       
62
       
-
       
    substituteInPlace zlibrary/text/Makefile \

     

       
63
       
63
       
-
       
      --replace -llinebreak -lunibreak

     

       
64
       
64
       
-
       
  '';

     

       
65
       
65
       
-
       


     

       
66
       
66
       
-
       
  nativeBuildInputs = [ pkg-config ];

     

       
67
       
67
       
-
       


     

       
68
       
68
       
-
       
  buildInputs = [

     

       
69
       
69
       
-
       
    bzip2

     

       
70
       
70
       
-
       
    curl

     

       
71
       
71
       
-
       
    expat

     

       
72
       
72
       
-
       
    fribidi

     

       
73
       
73
       
-
       
    libunibreak

     

       
74
       
74
       
-
       
    sqlite

     

       
75
       
75
       
-
       
    zlib

     

       
76
       
76
       
-
       
  ]

     

       
77
       
77
       
-
       
  ++ optional (uiType == "qt4") qt4

     

       
78
       
78
       
-
       
  ++ optional (uiType == "gtk") gtk2

     

       
79
       
79
       
-
       
  ++ optionals (uiType == "cocoa") [ AppKit Cocoa ];

     

       
80
       
80
       
-
       


     

       
81
       
81
       
-
       
  makeFlags = [ "INSTALLDIR=$(out)" ];

     

       
82
       
82
       
-
       


     

       
83
       
83
       
-
       
  NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";

     

       
84
       
84
       
-
       


     

       
85
       
85
       
-
       
  meta = with lib; {

     

       
86
       
86
       
-
       
    description = "An e-book reader for Linux";

     

       
87
       
87
       
-
       
    homepage = "http://www.fbreader.org/";

     

       
88
       
88
       
-
       
    license = licenses.gpl3;

     

       
89
       
89
       
-
       
    broken = stdenv.isDarwin  # untested, might work

     

       
90
       
90
       
-
       
      || uiType == "gtk"; # builds, but the result is unusable, hangs a lot

     

       
91
       
91
       
-
       
    platforms = platforms.unix;

     

       
92
       
92
       
-
       
    maintainers = [ maintainers.coroa ];

     

       
93
       
93
       
-
       
  };

     

       
94
       
94
       
-
       
}

     

···

       
1
       
1
       
-
       
diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp

     

       
2
       
2
       
-
       
index e33a22e76..1b6092800 100644

     

       
3
       
3
       
-
       
--- a/fbreader/src/database/booksdb/BooksDB.cpp

     

       
4
       
4
       
-
       
+++ b/fbreader/src/database/booksdb/BooksDB.cpp

     

       
5
       
5
       
-
       
@@ -146,5 +146,5 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) {

     

       
6
       
6
       
-
       
 	myFindFileId->setFileName(fileName);

     

       
7
       
7
       
-
       
 	if (!myFindFileId->run()) {

     

       
8
       
8
       
-
       
-		return false;

     

       
9
       
9
       
-
       
+		return 0;

     

       
10
       
10
       
-
       
 	}

     

       
11
       
11
       
-
       
 	((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();

     

···

       
408
       
408
       
 
       
  facette = throw "facette has been removed"; # Added 2020-01-06

     

       
409
       
409
       
 
       
  fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28

     

       
410
       
410
       
 
       
  fastnlo = fastnlo_toolkit; # Added 2021-04-24

     

       
411
       
411
       
+
       
  fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26

     

       
411
       
412
       
 
       
  fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13

     

       
412
       
413
       
 
       
  feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03

     

       
413
       
414
       
 
       
  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H";

     

···

       
26856
       
26856
       
 
       


     

       
26857
       
26857
       
 
       
  fbpanel = callPackage ../applications/window-managers/fbpanel { };

     

       
26858
       
26858
       
 
       


     

       
26859
       
26859
       
-
       
  fbreader = callPackage ../applications/misc/fbreader {

     

       
26860
       
26860
       
-
       
    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;

     

       
26861
       
26861
       
-
       
  };

     

       
26862
       
26862
       
-
       


     

       
26863
       
26859
       
 
       
  fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };

     

       
26864
       
26860
       
 
       


     

       
26865
       
26861
       
 
       
  feedbackd = callPackage ../applications/misc/feedbackd { };