diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-24 13:34:03 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-25 08:49:39 -0500 |
| commit | 84ed4737635c068e716a8fc286b081bfe5d1febc (patch) | |
| tree | 2ebe4cf117a50fdb47c72da83f29a3de317862b6 /pkgs | |
| parent | 8526c87e24219e20fbdc6f280ad5b7a4d2661190 (diff) | |
| download | nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar.gz nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar.bz2 nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar.lz nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar.xz nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.tar.zst nixlib-84ed4737635c068e716a8fc286b081bfe5d1febc.zip | |
notepadqq: correct packaging errors and pin to Qt 5.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/notepadqq/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 0de33d6d1949..b553e09ed5e2 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2004b75dda09..3842d1381821 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |