diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2016-09-09 10:04:36 -0300 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-09-09 15:25:28 +0200 |
| commit | 8f6af86d5e3fe0d57a1bf29ccbb0103789169552 (patch) | |
| tree | a79a3e3cd60813d49e455c455a0f73c801d5aadf /pkgs/applications/graphics/feh | |
| parent | 91e4e3184747762c31e23bc1ed6b1f9ad5c2cb19 (diff) | |
| download | nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar.gz nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar.bz2 nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar.lz nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar.xz nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.tar.zst nixpkgs-8f6af86d5e3fe0d57a1bf29ccbb0103789169552.zip | |
feh: avoid using xlibsWrapper
Diffstat (limited to 'pkgs/applications/graphics/feh')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 728425e9f4b..380e5d29886 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" |