ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

notepadqq: correct packaging errors and pin to Qt 5.6

Browse Source
This commit is contained in:
Thomas Tuegel 2017-03-24 13:34:03 -05:00
parent 8526c87e24
commit 84ed473763
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/notepadqq/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, which, qtbase }:
{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
let
version = "0.53.0";
@ -12,11 +12,11 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [
pkgconfig which
pkgconfig which qttools
];
buildInputs = [
qtbase.qtsvg qtbase.qtwebkit qtbase.qttools
qtbase qtsvg qtwebkit
];
preConfigure = ''

4
pkgs/top-level/all-packages.nix
View File

@ -14804,9 +14804,7 @@ with pkgs;
nedit = callPackage ../applications/editors/nedit { };
notepadqq = callPackage ../applications/editors/notepadqq {
qtbase = qt55;
};
notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch { };