git.iko.soy/typeable/nixpkgs
on master help sign in
privateer: drop

It was marked as broken in August 2015.

commit0b7ebd1b517da92cefe3eae027c02152c3412e69 authorRobert Schütz <dev@schuetz-co.de> dateTue 18 May 2021, 11:59 (6 years ago) parent1e85864
4 files changed+1−71
pkgs/games/privateer/0001-fix-VSFile-constructor.patch−25 pkgs/games/privateer/default.nix−44 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/games/privateer/0001-fix-VSFile-constructor.patchdeleted−25
@@ -1,25 +0,0 @@
1−From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001
2−From: Florian Friesdorf <flo@chaoflow.net>
3−Date: Wed, 4 Jan 2012 23:32:19 +0100
4−Subject: [PATCH] fix VSFile constructor
5−
6−---
7− src/vsfilesystem.h | 2 +-
8− 1 files changed, 1 insertions(+), 1 deletions(-)
9−
10−diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h
11−index 4bb7a66..71bf9b9 100644
12−--- a/src/vsfilesystem.h
13−+++ b/src/vsfilesystem.h
14−@@ -291,7 +291,7 @@ namespace VSFileSystem
15− VSFile();
16− VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly);
17− VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly);
18−- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
19−+ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); }
20− ~VSFile();
21−
22− FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files)
23−--
24−1.7.8
25−
pkgs/games/privateer/default.nixdeleted−44
@@ -1,44 +0,0 @@
1−{ lib, stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib,
2− gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
3− libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }:
4−
5−stdenv.mkDerivation {
6− name = "privateer-1.03";
7−
8− src = fetchsvn {
9− #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin";
10− url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine";
11− rev = "294";
12− sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63";
13− };
14−
15− nativeBuildInputs = [ cmake pkg-config ];
16− buildInputs =
17− [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng
18− libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal
19− pixman python27 SDL ];
20−
21− patches = [ ./0001-fix-VSFile-constructor.patch ];
22−
23− preConfigure = ''
24− NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
25− '';
26−
27− installPhase = ''
28− mkdir -p $out/bin
29− cp vegastrike $out/bin
30− cp vegaserver $out/bin
31− '';
32−
33− meta = with lib; {
34− homepage = "http://privateer.sourceforge.net/";
35− description = "Adventure space flight simulation computer game";
36− license = licenses.gpl2Plus; # and a special license for art data
37− # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt
38−
39− maintainers = with maintainers; [ ];
40− platforms = with platforms; linux ++ darwin;
41− hydraPlatforms = [];
42− broken = true; # it won't build
43− };
44−}
pkgs/top-level/aliases.nix+1
@@ -606,6 +606,7 @@ mapAliases ({
606606 postgis = postgresqlPackages.postgis;
607607 # end
608608 ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream.";
609+ privateer = throw "privateer was removed because it was broken"; # added 2021-05-18
609610 processing3 = processing; # added 2019-08-16
610611 procps-ng = procps; # added 2018-06-08
611612 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12
pkgs/top-level/all-packages.nix−2
@@ -28307,8 +28307,6 @@ in
2830728307
2830828308 prboom = callPackage ../games/prboom { };
2830928309
28310− privateer = callPackage ../games/privateer { };
28311−
2831228310 pysolfc = python3Packages.callPackage ../games/pysolfc { };
2831328311
2831428312 qqwing = callPackage ../games/qqwing { };