From ccbf3c89550342fba1ebac9d4d3cdfb161bf207b Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 4 Apr 2018 19:09:57 +0300
Subject: [PATCH] k3b: fix build inputs, library path and binary path

Fix #38325
---
 pkgs/applications/kde/k3b.nix | 18 ++++++++++++------
 1 file 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}
     '';
 }