diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/applications/misc/nixnote2 | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
download | nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
Diffstat (limited to 'pkgs/applications/misc/nixnote2')
-rw-r--r-- | pkgs/applications/misc/nixnote2/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 4ac152c2669..12f8c12b586 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: +{ stdenv, mkDerivation, fetchFromGitHub, boost +, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { name = "nixnote2-${version}"; @@ -11,7 +12,7 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; - buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; enableParallelBuilding = true; @@ -28,7 +29,7 @@ mkDerivation rec { substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; - + postInstal = '' cp images/windowIcon.png $out/share/pixmaps/nixnote2.png ''; |