diff options
Diffstat (limited to 'pkgs/top-level/perl-packages.nix')
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 838e5353b2f..a6b75136325 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4687,7 +4687,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetoptLong ]; + pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -4697,7 +4697,7 @@ let self = _self // overrides; _self = with self; { # tests fail doCheck = false; - makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; + makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}"; }; GDSecurityImage = buildPerlPackage { @@ -8249,7 +8249,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xlibs.libX11 xlibs.libXi xlibs.libXmu xlibs.libXext xdummy ]; + buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -11723,8 +11723,8 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xlibs.libX11}/lib"; - buildInputs = with pkgs; [ xlibs.libX11 libpng ]; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags ''; @@ -12149,9 +12149,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AW/AWENDT/${name}.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; - buildInputs = [ pkgs.xlibs.libXext pkgs.xlibs.libXScrnSaver pkgs.xlibs.libX11 ]; + buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xlibs.libX11}/lib/ -L${pkgs.xlibs.libXext}/lib/ -L${pkgs.xlibs.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; |