b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #222477 from wegank/rigsofrods-drop

Browse source 
rigsofrods: alias to rigsofrods-bin
This commit is contained in:
Weijia Wang 2023-03-22 09:12:44 +02:00 committed by GitHub
parent cb4b7e205f d477a191ac
commit 3193993bcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 1 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/development/interpreters/angelscript/2.22.nix
View file

@ -1,35 +0,0 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
pname = "angelscript";
version = "2.22.2";
nativeBuildInputs = [ unzip ];
src = fetchurl {
url = "http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "sha256-gzR96GSZJNV+bei3OPqlx7aw+WBv8XRpHGh8u+go6N4=";
};
preConfigure = ''
cd angelscript/projects/gnuc
sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
export SHARED=1
export VERSION="${version}"
mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
'';
postBuild = ''
rm ../../lib/*
'';
postInstall = ''
mkdir -p "$out/share/docs/angelscript"
cp -r ../../../docs/* "$out/share/docs/angelscript"
'';
meta = with lib; {
description = "Light-weight scripting library";
license = licenses.zlib;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
homepage = "http://www.angelcode.com/angelscript/";
};
}

59
pkgs/development/libraries/mysocketw/default.nix
View file

@ -1,59 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, openssl
, cmake
}:
let
joinpaths-src = fetchurl {
url = "https://github.com/AnotherFoxGuy/CMakeCM/raw/afe41f4536ae21f6f11f83e8c0b8b8c450ef1332/modules/JoinPaths.cmake";
hash = "sha256-eUsNj6YqO3mMffEtUBFFgNGkeiNL+2tNgwkutkam7MQ=";
};
in
stdenv.mkDerivation rec {
pname = "mysocketw";
version = "3.11.0";
src = fetchFromGitHub {
owner = "RigsOfRods";
repo = "socketw";
rev = version;
hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo=";
};
patches = [
# in master post 3.11.0, see https://github.com/RigsOfRods/socketw/issues/16
(fetchpatch {
name = "fix-pkg-config.patch";
url = "https://github.com/RigsOfRods/socketw/commit/17cad062c3673bd0da74a2fecadb01dbf9813a07.patch";
sha256 = "01b019gfm01g0r1548cizrf7mqigsda8jnrzhg8dhi9c49nfw1bp";
})
];
nativeBuildInputs = [
cmake
];
buildInputs = [
openssl
];
postUnpack = ''(
mkdir -p source/build/_cmcm-modules/resolved && cd $_
cp ${joinpaths-src} JoinPaths.cmake
printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence
)'';
meta = with lib; {
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
homepage = "https://github.com/RigsOfRods/socketw";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

13
pkgs/development/libraries/mysocketw/gcc.patch
View file

@ -1,13 +0,0 @@
I picked it up from:
http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
--- a/src/sw_base.cxx.old 2009-12-19 21:19:31.057051328 -0800
+++ b/src/sw_base.cxx 2009-12-19 21:19:44.939551918 -0800
@@ -19,6 +19,7 @@
#include <time.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#ifndef __WIN32__
#include <netdb.h>

42
pkgs/development/libraries/ogrepaged/default.nix
View file

@ -1,42 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec {
pname = "ogre-paged";
version = "1.2.0";
src = fetchFromGitHub {
owner = "RigsOfRods";
repo = "ogre-pagedgeometry";
rev = "v${version}";
sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U=";
};
patches = [
# These patches come from https://github.com/RigsOfRods/ogre-pagedgeometry/pull/6
# and make ogre-paged build with ogre-1.10.
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/2d4df577decba37ec3cdafc965deae0f6d31fe45.patch";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
})
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/4d81789ec6f55e294a5ad040ea7abe2b415cbc92.patch";
sha256 = "17q8djdz2y3g46azxc3idhyvi6vf0sqkxld4bbyp3l9zn7dq76rp";
})
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/10f7c5ce5b422e9cbac59d466f3567a24c8831a4.patch";
sha256 = "1kk0dbadzg73ai99l3w04q51sil36vzbkaqc79mdwy0vjrn4ardb";
})
];
buildInputs = [ ois ogre libX11 boost ];
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ];
meta = {
description = "Paged Geometry for Ogre3D";
homepage = "https://github.com/RigsOfRods/ogre-paged";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
};
}

42
pkgs/games/rigsofrods/default.nix
View file

@ -1,42 +0,0 @@
{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost,
pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
angelscript, ogrepaged, mysocketw, libxcb
}:
stdenv.mkDerivation rec {
version = "0.4.7.0";
pname = "rigsofrods";
src = fetchFromGitHub {
owner = "RigsOfRods";
repo = "rigs-of-rods";
rev = version;
sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4";
};
patches = [
./gtk3.patch
];
installPhase = ''
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
mkdir -p $out/share/rigsofrods
cp -r bin/* $out/share/rigsofrods
cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
mkdir -p $out/bin
ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
'';
nativeBuildInputs = [ cmake pkg-config unzip ];
buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
libuuid openal ogre ois curl gtk3 mygui angelscript
ogrepaged mysocketw libxcb ];
meta = with lib; {
description = "3D simulator game where you can drive, fly and sail various vehicles";
homepage = "https://rigsofrods.sourceforge.net/";
license = licenses.gpl3;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

29
pkgs/games/rigsofrods/gtk3.patch
View file

@ -1,29 +0,0 @@
diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake
index 1bdf93c..4773fca 100644
--- a/cmake/DependenciesConfig.cmake
+++ b/cmake/DependenciesConfig.cmake
@@ -187,10 +187,8 @@ endmacro(importLib)
ELSEIF(UNIX)
find_package(PkgConfig)
- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
- PKG_CHECK_MODULES (GTK_PIXBUF gdk-pixbuf-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED)
include_directories(${GTK_INCLUDE_DIRS})
- include_directories(${GTK_PIXBUF_INCLUDE_DIRS})
# Ogre basics
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
index 51cc350..7f723b6 100644
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@@ -56,7 +56,7 @@ IF(WIN32)
endif(ROR_USE_OPENCL)
ELSEIF(UNIX)
find_package(PkgConfig)
- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED)
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)

1
pkgs/top-level/aliases.nix
View file

@ -1373,6 +1373,7 @@ mapAliases ({
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23
riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22
riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14
rigsofrods = rigsofrods-bin; # Added 2023-03-22
rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15
ring-daemon = jami-daemon; # Added 2021-10-26
rkt = throw "rkt was archived by upstream"; # Added 2020-05-16

19
pkgs/top-level/all-packages.nix
View file

@ -16429,8 +16429,6 @@ with pkgs;
angelscript = callPackage ../development/interpreters/angelscript { };
angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix { };
babashka = callPackage ../development/interpreters/clojure/babashka.nix { };
# BQN interpreters and compilers
@ -22616,8 +22614,6 @@ with pkgs;
ogre = ogre1_9;
};
mysocketw = callPackage ../development/libraries/mysocketw { };
mythes = callPackage ../development/libraries/mythes { };
nanodbc = callPackage ../development/libraries/nanodbc { };
@ -22772,10 +22768,6 @@ with pkgs;
ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix { };
ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { };
ogrepaged = callPackage ../development/libraries/ogrepaged {
ogre = ogre1_9;
};
olm = callPackage ../development/libraries/olm { };
one_gadget = callPackage ../development/tools/misc/one_gadget { };
@ -36056,17 +36048,6 @@ with pkgs;
rftg = callPackage ../games/rftg { };
rigsofrods = callPackage ../games/rigsofrods {
angelscript = angelscript_2_22;
ogre = ogre1_9;
ogrepaged = ogrepaged.override {
ogre = ogre1_9;
};
mygui = mygui.override {
withOgre = true;
};
};
rigsofrods-bin = callPackage ../games/rigsofrods-bin { };
riko4 = callPackage ../games/riko4 { };