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

flightgear, simgear & speed_dreams: use openscenegraph_3_4 (version 3.4.0) instead of openscenegraph (version 3.6.2)

Browse Source
This commit is contained in:
Aaron Andersen 2018-11-01 18:15:10 -04:00
parent 0cca209943
commit b543748771
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -11605,6 +11605,7 @@ with pkgs;
opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
openscenegraph = callPackage ../development/libraries/openscenegraph { }; openscenegraph = callPackage ../development/libraries/openscenegraph { };
openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { };
openslp = callPackage ../development/libraries/openslp {}; openslp = callPackage ../development/libraries/openslp {};
@ -12190,7 +12191,7 @@ with pkgs;
avrlibc = pkgsCross.avr.libcCross; avrlibc = pkgsCross.avr.libcCross;
}; };
simgear = callPackage ../development/libraries/simgear { }; simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; };
simp_le = callPackage ../tools/admin/simp_le { }; simp_le = callPackage ../tools/admin/simp_le { };
@ -20236,7 +20237,7 @@ with pkgs;
fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
flightgear = libsForQt5.callPackage ../games/flightgear { }; flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; };
flock = callPackage ../development/tools/flock { }; flock = callPackage ../development/tools/flock { };
@ -20678,6 +20679,7 @@ with pkgs;
# Torcs wants to make shared libraries linked with plib libraries (it provides static). # Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC # i686 is the only platform I know than can do that linking without plib built with -fPIC
libpng = libpng12; libpng = libpng12;
openscenegraph = openscenegraph_3_4;
}; };
torcs = callPackage ../games/torcs { }; torcs = callPackage ../games/torcs { };