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/k3b.nix | |
| parent | 945758f96030ee7762ccdab32a3ffddd028b37b6 (diff) | |
Remove kdeWrapper
Diffstat (limited to 'pkgs/applications/kde/k3b.nix')
| -rw-r--r-- | pkgs/applications/kde/k3b.nix | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index c21ce4a3e1877..6fd6fbee9f58b 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, kdeWrapper, extra-cmake-modules +{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules , qtwebkit , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -7,35 +7,34 @@ , ffmpeg, libmusicbrainz2, normalize, sox, transcode }: -let - unwrapped = - mkDerivation { - name = "k3b"; - meta = with lib; { - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ sander phreedom ]; - platforms = platforms.linux; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - # qt - qtwebkit - # kde - libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui - # formats - flac lame libmad libmpcdec libvorbis - # sound utilities - libsamplerate libsndfile taglib - # cd/dvd - cdparanoia libdvdcss libdvdread - # others - ffmpeg libmusicbrainz2 - ]; - enableParallelBuilding = true; - }; - -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/k3b" ]; - paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ]; +mkDerivation { + name = "k3b"; + meta = with lib; { + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ sander phreedom ]; + platforms = platforms.linux; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ + # qt + qtwebkit + # kde + libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui + # formats + flac lame libmad libmpcdec libvorbis + # sound utilities + libsamplerate libsndfile taglib + # cd/dvd + cdparanoia libdvdcss libdvdread + # others + ffmpeg libmusicbrainz2 + ]; + preFixup = + let k3bPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager + ]; + in '' + gappsWrapperArgs+=(--prefix PATH : "${k3bPath}") + ''; } |