diff options
| author | Hugo Tavares Reis <hugo@linux.com> | 2018-02-20 12:40:03 +0100 |
|---|---|---|
| committer | Hugo Tavares Reis <hugo@linux.com> | 2018-02-20 13:46:44 +0100 |
| commit | 27ce04207f916cf06fd4ac0ddc837b02135f2bfa (patch) | |
| tree | d7466784289ba208ac1682d38a29c9f2e04e8b74 /pkgs | |
| parent | 81081ba670df15726a37a8d823ccee613de68154 (diff) | |
| download | nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar.gz nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar.bz2 nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar.lz nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar.xz nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.tar.zst nixlib-27ce04207f916cf06fd4ac0ddc837b02135f2bfa.zip | |
nixnote2: init at 2.0.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/nixnote2/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 40 insertions, 1 deletions
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix new file mode 100644 index 000000000000..971da8ba0483 --- /dev/null +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -0,0 +1,37 @@ +{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: + +mkDerivation rec { + name = "nixnote2-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "baumgarr"; + repo = "nixnote2"; + rev = "v${version}"; + sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; + }; + + buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + # Fix location of poppler-qt5.h + for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do + substituteInPlace $f \ + --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>' + done + + substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' + ''; + + meta = with stdenv.lib; { + description = "An unofficial client of Evernote"; + homepage = http://www.nixnote.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ htr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce18e9d3762d..113ec8f9b816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,6 +3236,8 @@ with pkgs; ninka = callPackage ../development/tools/misc/ninka { }; + nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nodejs = hiPrio nodejs-6_x; nodejs-slim = nodejs-slim-6_x; @@ -5755,7 +5757,7 @@ with pkgs; compcert = callPackage ../development/compilers/compcert { }; cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { |