public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/electronics/kicad/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU_combined, zlib
{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
, wrapGAppsHook
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ pythonPackages.wxPython ];
buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost
swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade
pkgs/applications/science/electronics/kicad/unstable.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice
pkgs/applications/science/electronics/pcb/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined
, netpbm, imagemagick, dbus, xlibsWrapper, libGLU, libGL
, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
libGLU_combined tcl shared-mime-info tk
libGLU libGL tcl shared-mime-info tk
gnome2.gtkglext pangox_compat gd xorg.libXmu
];