diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-18 17:02:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 17:02:01 +0000 |
| commit | 1148ce1b601fd0e64088458014cecd08bc2b8e1e (patch) | |
| tree | 85c2ac7367280f38cdbb4c92ab316bd36b18572b /pkgs/applications | |
| parent | 59ec6b559d0af8ab790f533cc206363ebb34cf84 (diff) | |
| parent | 6d2edfb0b86927319de59dcd6c98f9a66cd57f65 (diff) | |
| download | nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar.gz nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar.bz2 nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar.lz nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar.xz nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.tar.zst nixpkgs-1148ce1b601fd0e64088458014cecd08bc2b8e1e.zip | |
Merge pull request #52062 from volth/perl526-drop
perl526: drop
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/slic3r/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/slic3r/prusa3d.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/sieve-connect/default.nix | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 50664fc9e59..bbc7a9b1d11 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { install -D -m 644 man/*.1 $out/share/man/man1 ''; - checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + checkInputs = [ perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" ''; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 7b28462d552..e012c3763b3 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - buildInputs = - [boost] ++ + buildInputs = + [boost] ++ (with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp threads + EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 251ee4d918b..680703737c2 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { Moo NetDBus OpenGL - threads XMLSAX ]); diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index 78910d1ecf6..472a26274f8 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -29,7 +29,7 @@ wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ - AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS TermReadKey TermReadLineGnu ])}" ''; |