diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/applications/graphics/feh/default.nix | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-origin/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/applications/graphics/feh/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 380e5d298864..40fe178d6257 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; |