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

Merge pull request #66227 from aanderse/osg-3.4

Browse Source 
openscenegraph: drop 3.4.x
This commit is contained in:
Michael Raskin 2019-08-08 05:19:33 +00:00 committed by GitHub
commit 6b5647a70d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/development/libraries/openscenegraph/3.4.0.nix
View File

@ -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";
};
}

19
pkgs/development/libraries/simgear/default.nix
View File

@ -3,26 +3,29 @@
, openscenegraph, openal, expat, cmake, apr , openscenegraph, openal, expat, cmake, apr
, curl , curl
}: }:
let
version = "2019.1.1";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simgear-${version}"; pname = "simgear";
version = "2018.3.1"; inherit version;
shortVersion = "2018.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99"; sha256 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0";
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut
openscenegraph openal expat cmake apr curl ]; openscenegraph openal expat apr curl ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Simulation construction toolkit"; description = "Simulation construction toolkit";
homepage = https://gitorious.org/fg/simgear; homepage = "https://gitorious.org/fg/simgear";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.lgpl2; license = licenses.lgpl2;

20
pkgs/games/flightgear/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, wrapQtAppsHook
, freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib , freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib
, libSM, libunwind, libX11, xorgproto, libXext, libXi , libSM, libunwind, libX11, xorgproto, libXext, libXi
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
@ -6,14 +6,14 @@
}: }:
let let
version = "2018.3.1"; version = "2019.1.1";
shortVersion = "2018.3"; shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec { data = stdenv.mkDerivation rec {
name = "flightgear-base-${version}"; name = "flightgear-base-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh"; sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf";
}; };
phases = [ "installPhase" ]; phases = [ "installPhase" ];
@ -25,13 +25,13 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flightgear-${version}"; pname = "flightgear";
# inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
inherit version data; inherit version data;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix"; sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi";
}; };
# Of all the files in the source and data archives, there doesn't seem to be # Of all the files in the source and data archives, there doesn't seem to be
@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
categories = "Game;Simulation"; categories = "Game;Simulation";
}; };
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ buildInputs = [
makeWrapper
freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xorgproto libXext libXi libSM libunwind libX11 xorgproto libXext libXi
libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase
glew qtdeclarative glew qtdeclarative
]; ];
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
''; '';
qtWrapperArgs = [ qtWrapperArgs = [
''--set FG_ROOT "${data}/share/FlightGear"'' "--set FG_ROOT ${data}/share/FlightGear"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

36
pkgs/games/speed-dreams/default.nix
View File

@ -1,29 +1,33 @@
{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, { fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat,
libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell }: libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }:
let
version = "2.2.2-r6553";
shortVersion = builtins.substring 0 5 version;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.1-r6404"; inherit version;
name = "speed-dreams-${version}"; pname = "speed-dreams";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-base-${version}.tar.xz"; url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz";
sha256 = "0347sk8xbdsyvl48qybbycd7hvzsx5b37zzjx1yx73nzddhmlpbx"; sha256 = "1l47d2619kpfkvdwbkwr311qss6jjfwvgl5h9z2w3bwdgz0mbaij";
}; };
cars-and-tracks = fetchurl { cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz"; url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "1h50l110n42nrq6j3kcyhi3swgmrjcg979vb6h0zsf46afwv0z3q"; sha256 = "0l8ba5pzqqcfy4inyxy2lrrhhgfs43xab7fy751xz2xqpqpfksyq";
}; };
more-cars-and-tracks = fetchurl { more-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz"; url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "03m3gwd03jqgsfjdglzmrv613cp4gh50i63fwmnwl282zhxydcwd"; sha256 = "10w180mhhk6dw4cza6mqa0hp5qgym9lcizfwykqbgcvs01yl2yqb";
}; };
wip-cars-and-tracks = fetchurl { wip-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz"; url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
sha256 = "0ysk756rd294xzpwvmjh0mb229ngzrc4ry9lpyhyak98rbcp9hxm"; sha256 = "1wad9yaydaryhyi7ckyaii124h0z7kziqgcl475a5jr7ggbxc24q";
}; };
sourceRoot = "."; sourceRoot = ".";
@ -35,12 +39,6 @@ stdenv.mkDerivation rec {
tar -xf ${wip-cars-and-tracks} tar -xf ${wip-cars-and-tracks}
''; '';
prePatch = ''
# https://sourceforge.net/p/speed-dreams/mailman/message/35665539/
sed -i "s|lastSlash = '\\\0'|lastSlash = NULL|" src/libs/tgf/params.cpp
sed -i "s|const char\* error = '\\\0'|const char\* error = NULL|" src/libs/tgfclient/openalmusicplayer.cpp
'';
preBuild = '' preBuild = ''
make -C src/libs/portability make -C src/libs/portability
make -C src/libs/portability portability.o make -C src/libs/portability portability.o
@ -62,11 +60,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat
SDL2 enet libjpeg openscenegraph libvorbis ]; SDL2 enet libjpeg openscenegraph libvorbis curl ];
meta = { meta = {
description = "Car racing game - TORCS fork with more experimental approach"; description = "Car racing game - TORCS fork with more experimental approach";
homepage = http://speed-dreams.sourceforge.net/; homepage = "http://speed-dreams.sourceforge.net/";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [raskin]; maintainers = with stdenv.lib.maintainers; [raskin];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

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

@ -12747,7 +12747,6 @@ in
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 {};
@ -13359,7 +13358,7 @@ in
inherit (darwin.apple_sdk.frameworks) GLUT; 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 { }; simp_le = callPackage ../tools/admin/simp_le { };
@ -21821,7 +21820,7 @@ in
fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; 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 { }; flock = callPackage ../development/tools/flock { };
@ -22299,7 +22298,6 @@ in
# 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 { };