Merge pull request #38437 from jluttine/fix-k3b-libpath

k3b: fix build inputs and library/binary paths
This commit is contained in:
Matthew Justin Bauer 2018-04-08 21:34:23 -05:00 committed by GitHub
commit d6ce4855b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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}
'';
}