From 41e124f033605f242da9d8e684839095d85891a2 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 16 Aug 2021 23:57:05 +0300 Subject: [PATCH] =?UTF-8?q?lsd2dsl:=200.5.2=20=E2=86=92=200.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/lsd2dsl/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index b30d652584f5..8c884305277a 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -1,23 +1,33 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake +{ lib, stdenv, mkDerivation, fetchFromGitHub +, makeDesktopItem, copyDesktopItems, cmake , boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi"; + sha256 = "sha256-PLgfsVVrNBTxI4J0ukEOFRoBkbmB55/sLNn5KyiHeAc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isLinux copyDesktopItems; buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + desktopItems = lib.singleton (makeDesktopItem { + name = "lsd2dsl"; + exec = "lsd2dsl-qtgui"; + desktopName = "lsd2dsl"; + genericName = "lsd2dsl"; + comment = meta.description; + categories = "Dictionary;FileTools;Qt;"; + }); + installPhase = '' install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin '' + lib.optionalString stdenv.isDarwin '' @@ -33,6 +43,6 @@ mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; }