diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-16 10:56:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:43:39 -0500 |
| commit | be7b7d908f82e8ab16c43ffd0e240addd6f4018a (patch) | |
| tree | 81d875bcec94de6d94ce20725393d9c35f1c165a /pkgs/applications/kde/marble.nix | |
| parent | 945758f96030ee7762ccdab32a3ffddd028b37b6 (diff) | |
| download | nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.gz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.bz2 nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.lz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.xz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.zst nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.zip | |
Remove kdeWrapper
Diffstat (limited to 'pkgs/applications/kde/marble.nix')
| -rw-r--r-- | pkgs/applications/kde/marble.nix | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index eb059a1b3982..169b801b30d9 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,28 +1,16 @@ -{ mkDerivation, lib, kdeWrapper -, extra-cmake-modules, kdoctools +{ mkDerivation, lib +, extra-cmake-modules, kdoctools, wrapGAppsHook , qtscript, qtsvg, qtquickcontrols, qtwebkit , krunner, shared_mime_info, kparts, knewstuff , gpsd, perl }: -let - unwrapped = - mkDerivation { - name = "marble"; - meta.license = with lib.licenses; [ lgpl21 gpl3 ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; - propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info - krunner kparts knewstuff - gpsd - ]; - - enableParallelBuilding = true; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/marble-qt" "bin/marble" ]; - paths = [ unwrapped ]; +mkDerivation { + name = "marble"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ]; + propagatedBuildInputs = [ + qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + knewstuff gpsd + ]; } |