From f427f5296e9923d8c73541de6ac14b6c6d969ed1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:41:45 +0100 Subject: [PATCH] openlpFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/misc/openlp/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index 1ee48256474..a075a9bec6f 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -37,7 +37,8 @@ let # base pkg/lib baseLib = python3Packages.callPackage ./lib.nix { }; in mkDerivation { - inherit (baseLib) pname version src; + pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; + inherit (baseLib) version src; nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d42e17033d..69c3984bff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31811,12 +31811,12 @@ with pkgs; octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; - openlpFull = appendToName "full" (openlp.override { + openlpFull = openlp.override { pdfSupport = true; presentationSupport = true; vlcSupport = true; gstreamerSupport = true; - }); + }; dkh = callPackage ../applications/science/chemistry/dkh { };