From 7f3a18d33b8159d2993484c7b35cf685bff7e4f9 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 24 Aug 2020 17:14:31 +0200 Subject: [PATCH] featherpad: use qt5's mkDerivation --- pkgs/applications/editors/featherpad/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index c6089fd5308..8343472fa70 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,18 +1,18 @@ -{ stdenv, pkgconfig, qt5, fetchFromGitHub }: - -with qt5; - -stdenv.mkDerivation rec { - version = "0.10.0"; +{ stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +mkDerivation rec { pname = "featherpad"; + version = "0.10.0"; + src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eed8a8d532..216afec3be0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3555,7 +3555,7 @@ in fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = callPackage ../applications/editors/featherpad {}; + featherpad = qt5.callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {};