From 06105849982e6d9a808bdc0118b3a48440c6e84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Nov 2017 18:42:20 +0100
Subject: [PATCH] factor-lang: fix libGL when the OS uses non-mesa
I was careful to keep libGLU in LD_LIBRARY_PATH,
in the unlikely case that it's actually used.
Reported in https://github.com/NixOS/nixpkgs/issues/30749#issuecomment-341987725
---
pkgs/development/compilers/factor-lang/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 87572661635b..ae2d39d604a6 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git,
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
- mesa, libXmu, libXt, libICE, libSM }:
+ mesa_glu, libXmu, libXt, libICE, libSM }:
stdenv.mkDerivation rec {
name = "factor-lang-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ git rlwrap curl perl makeWrapper
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- mesa libXmu libXt libICE libSM ];
+ mesa_glu libXmu libXt libICE libSM ];
buildPhase = ''
make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev}
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# to be a generic solution here.
find $(echo ${stdenv.lib.makeLibraryPath [
glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- mesa libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
+ mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
for l in $(<$TMPDIR/so.lst);
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
"${stdenv.lib.makeLibraryPath [ glib
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- mesa libXmu libXt libICE libSM ]}"
+ mesa_glu libXmu libXt libICE libSM ]}"
sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
mv $out/bin/.factor-wrapped $out/lib/factor/factor