about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2019-08-08 05:19:33 +0000
committerGitHub <noreply@github.com>2019-08-08 05:19:33 +0000
commit6b5647a70db16ff901805a326ea40f013dcd1d09 (patch)
tree01ee8971c209ee5fec3c53109762ed84f1946a46 /pkgs/top-level
parent47b551c6a854a049045455f8ab1b8750e7b00625 (diff)
parentd2a1ae92442e2662b7a4198c82622ece371f0fd8 (diff)
downloadnixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar.gz
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar.bz2
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar.lz
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar.xz
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.tar.zst
nixlib-6b5647a70db16ff901805a326ea40f013dcd1d09.zip
Merge pull request #66227 from aanderse/osg-3.4
openscenegraph: drop 3.4.x
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31b0622d656f..e5a9f44c8d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12747,7 +12747,6 @@ in
   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 {};
 
@@ -13359,7 +13358,7 @@ in
     inherit (darwin.apple_sdk.frameworks) GLUT;
   };
 
-  simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; };
+  simgear = callPackage ../development/libraries/simgear { };
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
@@ -21821,7 +21820,7 @@ in
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; };
+  flightgear = libsForQt5.callPackage ../games/flightgear { };
 
   flock = callPackage ../development/tools/flock { };
 
@@ -22299,7 +22298,6 @@ in
     # 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 { };