Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/graphics/emulsion/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/rust/bindgen/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/misc/emulators/ruffle/default.nix pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
@@ -3,14 +3,14 @@
|
||||
let
|
||||
pname = "anki-bin";
|
||||
# Update hashes for both Linux and Darwin!
|
||||
version = "2.1.43";
|
||||
version = "2.1.44";
|
||||
|
||||
unpacked = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
|
||||
sha256 = "0kadv3fxi76h7xxmb4lckkgcwiv0b7cn630l62dxa2abxibans29";
|
||||
sha256 = "01d5ll3vsd4v0ikxgamv47bkwmag15vnmsgpda5wivc3dyawc9j9";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
|
||||
sha256 = "0vvgiybq1ygq7cly1r4ircgzg2cpprindr7nnlbnrmandjy2kw49";
|
||||
sha256 = "1zrdih4rjsq30480sf200pw59r42p3nq2md56kj2l641kbc7ljka";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
, pcre, makeWrapper, fetchpatch }:
|
||||
|
||||
let
|
||||
version = "784-october-preview";
|
||||
version = "822-december-preview";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenXRay";
|
||||
repo = "xray-16";
|
||||
rev = version;
|
||||
sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m";
|
||||
};
|
||||
|
||||
# https://github.com/OpenXRay/xray-16/issues/518
|
||||
@@ -20,7 +20,7 @@ let
|
||||
|
||||
inherit src;
|
||||
|
||||
postUnpack = "sourceRoot+=/Externals/cryptopp";
|
||||
sourceRoot = "source/Externals/cryptopp";
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
enableParallelBuilding = true;
|
||||
@@ -35,25 +35,30 @@ let
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "OpenXRay";
|
||||
pname = "openxray";
|
||||
inherit version src;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
|
||||
|
||||
# TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822
|
||||
# Fixes format hardening
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch";
|
||||
sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9";
|
||||
url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch";
|
||||
sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88";
|
||||
stripLen = 1;
|
||||
extraPrefix = "Externals/GameSpy/";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
|
||||
|
||||
buildInputs = [
|
||||
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
|
||||
libjpeg libogg tbb pcre
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
# https://github.com/OpenXRay/xray-16/issues/786
|
||||
preConfigure = ''
|
||||
substituteInPlace src/xrCore/xrCore.cpp \
|
||||
--replace /usr/share $out/share
|
||||
@@ -71,7 +76,7 @@ in stdenv.mkDerivation rec {
|
||||
license = licenses.unfree // {
|
||||
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
|
||||
};
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001
|
||||
From: Florian Friesdorf <flo@chaoflow.net>
|
||||
Date: Wed, 4 Jan 2012 23:32:19 +0100
|
||||
Subject: [PATCH] fix VSFile constructor
|
||||
|
||||
---
|
||||
src/vsfilesystem.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h
|
||||
index 4bb7a66..71bf9b9 100644
|
||||
--- a/src/vsfilesystem.h
|
||||
+++ b/src/vsfilesystem.h
|
||||
@@ -291,7 +291,7 @@ namespace VSFileSystem
|
||||
VSFile();
|
||||
VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly);
|
||||
VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly);
|
||||
- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
|
||||
+ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); }
|
||||
~VSFile();
|
||||
|
||||
FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files)
|
||||
--
|
||||
1.7.8
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{ lib, stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib,
|
||||
gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
|
||||
libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "privateer-1.03";
|
||||
|
||||
src = fetchsvn {
|
||||
#url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin";
|
||||
url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine";
|
||||
rev = "294";
|
||||
sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs =
|
||||
[ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng
|
||||
libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal
|
||||
pixman python27 SDL ];
|
||||
|
||||
patches = [ ./0001-fix-VSFile-constructor.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp vegastrike $out/bin
|
||||
cp vegaserver $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://privateer.sourceforge.net/";
|
||||
description = "Adventure space flight simulation computer game";
|
||||
license = licenses.gpl2Plus; # and a special license for art data
|
||||
# https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt
|
||||
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
hydraPlatforms = [];
|
||||
broken = true; # it won't build
|
||||
};
|
||||
}
|
||||
@@ -105,6 +105,7 @@ in buildFHSUserEnv rec {
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-plugins-base
|
||||
json-glib # paradox launcher (Stellaris)
|
||||
libdrm
|
||||
libxkbcommon # paradox launcher
|
||||
mono
|
||||
|
||||
@@ -31,28 +31,41 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ultrastardx";
|
||||
version = "2020.4.0";
|
||||
version = "2021-04-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "UltraStar-Deluxe";
|
||||
repo = "USDX";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym";
|
||||
rev = "d49e916705092f3d765d85d276b283b9e7e232a6";
|
||||
sha256 = "0sdcz2vc8i2z50nj7zbkdpxx2mvx0m0927lfsj7d7qr0p8vkm0wa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ fpc libpng ] ++ sharedLibs;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fpc-3.2-support.patch";
|
||||
url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch";
|
||||
sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/config.inc.in \
|
||||
--subst-var-by libpcre_LIBNAME libpcre.so.1
|
||||
|
||||
# ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive
|
||||
# upper bounds on the minor versions of .so files.
|
||||
# We can assume ffmpeg won’t break any major ABI compatibility, since their
|
||||
# patch version seems to always stay at 100,
|
||||
# and their minor version changes quite frequently.
|
||||
sed \
|
||||
-e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \
|
||||
-i src/lib/ffmpeg-4.0/avcodec.pas
|
||||
sed \
|
||||
-e 's/^ LIBAVFORMAT_MAX_VERSION_MINOR.*$/ LIBAVFORMAT_MAX_VERSION_MINOR = 1000;/' \
|
||||
-i src/lib/ffmpeg-4.0/avformat.pas
|
||||
sed \
|
||||
-e 's/^ LIBAVUTIL_MAX_VERSION_MINOR.*$/ LIBAVUTIL_MAX_VERSION_MINOR = 1000;/' \
|
||||
-i src/lib/ffmpeg-4.0/avutil.pas
|
||||
sed \
|
||||
-e 's/^ LIBSWRESAMPLE_MAX_VERSION_MINOR.*$/ LIBSWRESAMPLE_MAX_VERSION_MINOR = 1000;/' \
|
||||
-i src/lib/ffmpeg-4.0/swresample.pas
|
||||
sed \
|
||||
-e 's/^ LIBSWSCALE_MAX_VERSION_MINOR.*$/ LIBSWSCALE_MAX_VERSION_MINOR = 1000;/' \
|
||||
-i src/lib/ffmpeg-4.0/swscale.pas
|
||||
'';
|
||||
|
||||
preBuild = with lib;
|
||||
|
||||
Reference in New Issue
Block a user