From ca5687c4dd25feac7ac264c1b27c15339dd1ffd2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Sep 2020 05:29:19 -0500 Subject: [PATCH] appstream-qt: multiple outputs --- pkgs/development/libraries/appstream/qt.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 22f1566ad0a..c9fc96b3251 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,17 +1,24 @@ -{ stdenv, appstream, qtbase, qttools }: +{ stdenv, mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation { +mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; + outputs = [ "out" "dev" ]; + buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + postFixup = '' + sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ + -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" + ''; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; };