Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d6fd8b00817
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a4ba0920891b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 10, 2020

  1. appstream-qt: multiple outputs

    @ttuegel
    ttuegel committed Sep 10, 2020
    Copy the full SHA
    ca5687c View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97671 from ttuegel/appstream-qt-multiple-outputs 

    appstream-qt: multiple outputs
    @ttuegel
    ttuegel authored Sep 11, 2020
    Copy the full SHA
    a4ba092 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/libraries/appstream/qt.nix
11 changes: 9 additions & 2 deletions pkgs/development/libraries/appstream/qt.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};