vdrift: split data into separate derivation
This allows vdrift to be built on hydra without taking up a large amount of space.
This commit is contained in:
parent
607f36fd89
commit
298409f4ab
@ -0,0 +1,27 @@
|
|||||||
|
From 7ebe252a8488a63675d1c50c0faa1bdc5ff97889 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Linus Heckemann <git@sphalerite.org>
|
||||||
|
Date: Fri, 5 Jan 2018 21:27:28 +0100
|
||||||
|
Subject: [PATCH] Ignore missing data for installation
|
||||||
|
|
||||||
|
This is for packaging vdrift separately from its data in nixpkgs.
|
||||||
|
---
|
||||||
|
SConstruct | 3 ---
|
||||||
|
1 file changed, 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/SConstruct b/SConstruct
|
||||||
|
index 4394de0b..beef29a4 100644
|
||||||
|
--- a/SConstruct
|
||||||
|
+++ b/SConstruct
|
||||||
|
@@ -511,9 +511,6 @@ env.Alias(target = 'bin-package', source = bin_archive)
|
||||||
|
#----------------#
|
||||||
|
Export(['env', 'version', 'src_dir', 'bin_dir'])
|
||||||
|
if 'install' in COMMAND_LINE_TARGETS:
|
||||||
|
- if not os.path.isfile('data/SConscript'):
|
||||||
|
- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.'
|
||||||
|
- SConscript('data/SConscript')
|
||||||
|
# desktop appdata installation
|
||||||
|
install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop')
|
||||||
|
install_appdata = env.Install(env['destdir'] + env['prefix'] + '/share/appdata', 'vdrift.appdata.xml')
|
||||||
|
--
|
||||||
|
2.15.0
|
||||||
|
|
@ -1,8 +1,15 @@
|
|||||||
{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image, libvorbis,
|
{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image
|
||||||
bullet, curl, gettext }:
|
, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
, data ? fetchsvn {
|
||||||
|
url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
|
||||||
|
rev = 1386;
|
||||||
|
sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1";
|
||||||
|
}
|
||||||
|
}:
|
||||||
|
let
|
||||||
version = "git";
|
version = "git";
|
||||||
|
bin = stdenv.mkDerivation {
|
||||||
name = "vdrift-${version}";
|
name = "vdrift-${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
@ -12,18 +19,12 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
|
sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
|
||||||
};
|
};
|
||||||
|
|
||||||
data = fetchsvn {
|
|
||||||
url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
|
|
||||||
rev = 1386;
|
|
||||||
sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ];
|
buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ];
|
||||||
|
|
||||||
|
patches = [ ./0001-Ignore-missing-data-for-installation.patch ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
cp -r --reflink=auto $data data
|
|
||||||
chmod -R +w data
|
|
||||||
sed -i -e s,/usr/local,$out, SConstruct
|
sed -i -e s,/usr/local,$out, SConstruct
|
||||||
export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
|
export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
|
||||||
scons -j$NIX_BUILD_CORES
|
scons -j$NIX_BUILD_CORES
|
||||||
@ -34,8 +35,26 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Car racing game";
|
description = "Car racing game";
|
||||||
homepage = http://vdrift.net/;
|
homepage = http://vdrift.net/;
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
license = stdenv.lib.licenses.gpl2Plus;
|
||||||
maintainers = with stdenv.lib.maintainers; [viric lheckemann];
|
maintainers = with stdenv.lib.maintainers; [viric];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
wrappedName = "vdrift-${version}-with-data-${toString data.rev}";
|
||||||
|
in writeTextFile {
|
||||||
|
name = wrappedName;
|
||||||
|
text = ''
|
||||||
|
export VDRIFT_DATA_DIRECTORY="${data}"
|
||||||
|
exec ${bin}/bin/vdrift "$@"
|
||||||
|
'';
|
||||||
|
destination = "/bin/vdrift";
|
||||||
|
executable = true;
|
||||||
|
checkPhase = ''
|
||||||
|
${stdenv.shell} -n $out/bin/vdrift
|
||||||
|
'';
|
||||||
|
} // {
|
||||||
|
meta = bin.meta // {
|
||||||
hydraPlatforms = [];
|
hydraPlatforms = [];
|
||||||
};
|
};
|
||||||
|
unwrapped = bin;
|
||||||
|
inherit bin data;
|
||||||
}
|
}
|
||||||
|
@ -18533,6 +18533,9 @@ with pkgs;
|
|||||||
|
|
||||||
vdrift = callPackage ../games/vdrift { };
|
vdrift = callPackage ../games/vdrift { };
|
||||||
|
|
||||||
|
# To ensure vdrift's code is built on hydra
|
||||||
|
vdrift-bin = vdrift.bin;
|
||||||
|
|
||||||
vectoroids = callPackage ../games/vectoroids { };
|
vectoroids = callPackage ../games/vectoroids { };
|
||||||
|
|
||||||
vessel = callPackage_i686 ../games/vessel { };
|
vessel = callPackage_i686 ../games/vessel { };
|
||||||
|
Loading…
Reference in New Issue
Block a user