From 6b1d73f5e6da15efc3c71e7f0bad16d2f5fa1b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 8 Aug 2019 14:32:55 +0200 Subject: [PATCH] notepadqq: use qt5's mkDerivation See #65399 --- .../editors/notepadqq/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index ab79c3e780b2..efda2c583604 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: -let +mkDerivation rec { + pname = "notepadqq"; version = "1.4.8"; -in stdenv.mkDerivation { - name = "notepadqq-${version}"; src = fetchFromGitHub { owner = "notepadqq"; repo = "notepadqq"; @@ -24,13 +23,19 @@ in stdenv.mkDerivation { export LRELEASE="lrelease" ''; + dontWrapQtApps = true; + + preFixup = '' + wrapQtApp $out/bin/notepadqq + ''; + enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = https://notepadqq.com/; description = "Notepad++-like editor for the Linux desktop"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ rszibele ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.rszibele ]; }; }