diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
| commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
| tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/development/libraries/appstream | |
| parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
| parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
| download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip | |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/appstream')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/appstream/qt.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index c5a251cd5f9f..0013764d7791 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -1,5 +1,7 @@ { stdenv, appstream, qtbase, qttools }: +# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here + stdenv.mkDerivation rec { name = "appstream-qt-${version}"; inherit (appstream) version src prePatch; @@ -10,15 +12,6 @@ stdenv.mkDerivation rec { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; - postInstall = '' - rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share} - ''; - - preFixup = '' - patchelf --add-needed ${appstream}/lib/libappstream.so.4 \ - $out/lib/libAppStreamQt.so - ''; - meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; |