From 6b6454f190960eff595e06305d0633c283ea55a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 13 Oct 2016 19:43:04 +0200 Subject: [PATCH] perlPackages.OpenGL: 0.6703 -> 0.70 Fixes https://github.com/NixOS/nixpkgs/issues/19271 ("slic3r gui fails"). --- pkgs/development/perl-modules/perl-opengl.patch | 4 +++- pkgs/top-level/perl-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch index 77bba1efa41..a44dc4f2e42 100644 --- a/pkgs/development/perl-modules/perl-opengl.patch +++ b/pkgs/development/perl-modules/perl-opengl.patch @@ -2,12 +2,14 @@ diff --git a/Makefile.PL b/Makefile.PL index 55c485c..8501c02 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) +@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) # Look for available libs our @libdirs = qw { - -L/usr/lib +- -L/usr/lib/i386-linux-gnu - -L/usr/X11R6/lib +- -L/opt/X11/lib - -L/usr/local/lib - -L/usr/openwin/lib - -L/opt/csw/lib diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72b80afebbb..f0414b1b1ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9966,10 +9966,10 @@ let self = _self // overrides; _self = with self; { }; OpenGL = buildPerlPackage rec { - name = "OpenGL-0.6703"; + name = "OpenGL-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz"; - sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; + sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ];