dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/kde/k3b.nix
View File

@ -16,7 +16,7 @@ mkDerivation {
platforms = platforms.linux; platforms = platforms.linux;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
propagatedBuildInputs = [ buildInputs = [
# qt # qt
qtwebkit qtwebkit
# kde # kde
@ -32,11 +32,17 @@ mkDerivation {
]; ];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup = postFixup =
let k3bPath = lib.makeBinPath [ let
binPath = lib.makeBinPath [
cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
vcdimager vcdimager flac
];
libraryPath = lib.makeLibraryPath [
cdparanoia
]; ];
in '' in ''
wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" wrapProgram "$out/bin/k3b" \
--prefix PATH : "${binPath}" \
--prefix LD_LIBRARY_PATH : ${libraryPath}
''; '';
} }