diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /pkgs/applications/kde | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixlib-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/k3b.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 89bc171d2953..9b16485cfa77 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -16,7 +16,7 @@ mkDerivation { platforms = platforms.linux; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ # qt qtwebkit # kde @@ -32,11 +32,17 @@ mkDerivation { ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = - let k3bPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager - ]; + let + binPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager flac + ]; + libraryPath = lib.makeLibraryPath [ + cdparanoia + ]; in '' - wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + wrapProgram "$out/bin/k3b" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : ${libraryPath} ''; } |