aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

41
pkgs/games/endless-sky/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib, stdenv, fetchFromGitHub
, SDL2, libpng, libjpeg, glew, openal, scons, libmad
}:
stdenv.mkDerivation rec {
pname = "endless-sky";
version = "0.9.14";
src = fetchFromGitHub {
owner = "endless-sky";
repo = "endless-sky";
rev = "v${version}";
sha256 = "sha256-Vcck+zGcv39DXyhZF2DLUrXq3gDwkgL0NtPT5rVOpHs=";
};
patches = [
./fixes.patch
];
preBuild = ''
export AR="${stdenv.cc.targetPrefix}gcc-ar"
'';
enableParallelBuilding = true;
buildInputs = [
SDL2 libpng libjpeg glew openal scons libmad
];
prefixKey = "PREFIX=";
meta = with lib; {
description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
homepage = "https://endless-sky.github.io/";
license = with licenses; [
gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
];
maintainers = with maintainers; [ lheckemann ];
platforms = platforms.linux; # Maybe other non-darwin Unix
};
}

36
pkgs/games/endless-sky/fixes.patch Normal file
View file

@ -0,0 +1,36 @@
diff --git a/SConstruct b/SConstruct
index 48fd080..419b40d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
# Install the binary:
-env.Install("$DESTDIR$PREFIX/games", sky)
+env.Install("$DESTDIR$PREFIX/bin", sky)
# Install the desktop file:
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
diff --git a/source/Files.cpp b/source/Files.cpp
index c8c8957..d196459 100644
--- a/source/Files.cpp
+++ b/source/Files.cpp
@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv)
if(resources.back() != '/')
resources += '/';
#if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__
- // Special case, for Linux: the resource files are not in the same place as
- // the executable, but are under the same prefix (/usr or /usr/local).
- static const string LOCAL_PATH = "/usr/local/";
- static const string STANDARD_PATH = "/usr/";
- static const string RESOURCE_PATH = "share/games/endless-sky/";
- if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
- resources = LOCAL_PATH + RESOURCE_PATH;
- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
- resources = STANDARD_PATH + RESOURCE_PATH;
+ // Workaround for NixOS. Not sure how to proceed with other OSes, feedback
+ // is welcome.
+ resources += "../share/games/endless-sky/";
#elif defined __APPLE__
// Special case for Mac OS X: the resources are in ../Resources relative to
// the folder the binary is in.