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

Merge pull request #49617 from aanderse/openscenegraph_3_4

Browse Source 
Fix flightgear, simgear & speed_dreams
This commit is contained in:
Michael Raskin
2018-11-02 08:06:29 +00:00
committed by GitHub
parent 6753b2c6c1 51b661be2c
commit d24dee08e8
5 changed files with 56 additions and 10 deletions
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 { };
openscenegraph = callPackage ../development/libraries/openscenegraph { };
openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { };
openslp = callPackage ../development/libraries/openslp {};
@@ -12190,7 +12191,7 @@ with pkgs;
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 { };
@@ -20238,7 +20239,7 @@ with pkgs;
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 { };
@@ -20680,6 +20681,7 @@ with pkgs;
# 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
libpng = libpng12;
openscenegraph = openscenegraph_3_4;
};
torcs = callPackage ../games/torcs { };