From 8f6af86d5e3fe0d57a1bf29ccbb0103789169552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 9 Sep 2016 10:04:36 -0300 Subject: [PATCH] feh: avoid using xlibsWrapper --- pkgs/applications/graphics/feh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 728425e9f4b7..380e5d298864 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,5 +1,5 @@ -{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng -, libXinerama, curl, libexif, perlPackages }: +{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng +, curl, libexif, perlPackages }: stdenv.mkDerivation rec { name = "feh-2.17.1"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - nativeBuildInputs = [ makeWrapper ] + nativeBuildInputs = [ makeWrapper xorg.libXt ] ++ 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 = '' makeFlags="PREFIX=$out exif=1"