Merge pull request #66227 from aanderse/osg-3.4

openscenegraph: drop 3.4.x

2 files changed, 11 insertions, 47 deletions

diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix
deleted file mode 100644
index 8d0839041890..000000000000
--- a/pkgs/development/libraries/openscenegraph/3.4.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
-, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
-, cairo, poppler, librsvg, libpng, libtiff, libXrandr
-, xineLib, boost
-, withApps ? false
-, withSDL ? false, SDL
-, withQt4 ? false, qt4
-}:
-
-stdenv.mkDerivation rec {
-  name = "openscenegraph-${version}";
-  version = "3.4.0";
-
-  src = fetchurl {
-    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
-    sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
-  };
-
-  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
-
-  buildInputs = [
-    freetype libjpeg jasper libxml2 zlib gdal curl libX11
-    cairo poppler librsvg libpng libtiff libXrandr boost
-    xineLib
-  ] ++ lib.optional withSDL SDL
-    ++ lib.optional withQt4 qt4;
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
-
-  meta = with stdenv.lib; {
-    description = "A 3D graphics toolkit";
-    homepage = http://www.openscenegraph.org/;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    license = "OpenSceneGraph Public License - free LGPL-based license";
-  };
-}
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 11612eeb2884..471bcb222347 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -3,26 +3,29 @@
 , openscenegraph, openal, expat, cmake, apr
 , curl
 }:
-
+let
+  version = "2019.1.1";
+  shortVersion = builtins.substring 0 6 version;
+in
 stdenv.mkDerivation rec {
-  name = "simgear-${version}";
-  version = "2018.3.1";
-  shortVersion = "2018.3";
+  pname = "simgear";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
+    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
+    sha256 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
                   libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut
-                  openscenegraph openal expat cmake apr curl ];
+                  openscenegraph openal expat apr curl ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Simulation construction toolkit";
-    homepage = https://gitorious.org/fg/simgear;
+    homepage = "https://gitorious.org/fg/simgear";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.lgpl2;