diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/kde/k3b.nix | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/kde/k3b.nix')
-rw-r--r-- | pkgs/applications/kde/k3b.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 6fd6fbee9f58..e1f1132a08f3 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,6 +1,7 @@ -{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules +{ mkDerivation, lib +, extra-cmake-modules, kdoctools, makeWrapper , qtwebkit -, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui +, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager @@ -14,7 +15,7 @@ mkDerivation { maintainers = with maintainers; [ sander phreedom ]; platforms = platforms.linux; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; propagatedBuildInputs = [ # qt qtwebkit @@ -29,12 +30,12 @@ mkDerivation { # others ffmpeg libmusicbrainz2 ]; - preFixup = + postFixup = let k3bPath = lib.makeBinPath [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ]; in '' - gappsWrapperArgs+=(--prefix PATH : "${k3bPath}") + wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" ''; } |