public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feh: avoid using xlibsWrapper

Browse Source
This commit is contained in:
José Romildo Malaquias 2016-09-09 10:04:36 -03:00 committed by Bjørn Forsman
parent 91e4e31847
commit 8f6af86d5e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/feh/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng { stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng
, libXinerama, curl, libexif, perlPackages }: , curl, libexif, perlPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "feh-2.17.1"; name = "feh-2.17.1";
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper xorg.libXt ]
++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; ++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
preBuild = '' preBuild = ''
makeFlags="PREFIX=$out exif=1" makeFlags="PREFIX=$out exif=1"