Merge pull request #24181 from ndowens/feh

feh: Remove un-needed libPath
This commit is contained in:
Michael Raskin 2017-03-21 23:11:26 +01:00 committed by GitHub
commit 395af825a0

View File

@ -22,18 +22,17 @@ stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
makeFlags="PREFIX=$out exif=1" makeFlags="PREFIX=$out exif=1"
''; '';
libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
postInstall = '' postInstall = ''
wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
--add-flags '--theme=feh' --add-flags '--theme=feh'
''; '';
checkPhase = '' checkPhase = ''
PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
''; '';
doCheck = true; doCheck = true;
meta = { meta = {