Merge pull request #37992 from Twey/godot-3.0.2

remove godot_headers in favour of a dev output on godot
This commit is contained in:
xeji 2018-05-02 13:27:19 +02:00 committed by GitHub
commit c2769395b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 36 deletions

View file

@ -1,23 +0,0 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "godot_headers";
version = "2018-02-09";
src = fetchFromGitHub {
owner = "GodotNativeTools";
repo = "godot_headers";
rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
};
buildPhase = "true";
installPhase = ''
mkdir $out
cp -r . $out/include
'';
meta = {
homepage = "https://github.com/GodotNativeTools/godot_headers/";
description = "Headers for the Godot API supplied by the GDNative module";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.twey ];
};
}

View file

@ -34,27 +34,29 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildPhase = ''
scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \
scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \
${lib.concatStringsSep " "
(lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}
'';
outputs = [ "out" "dev" "man" ];
installPhase = ''
mkdir -p $out/bin
cp bin/godot.x11.tools.* $out/bin/godot
mkdir -p "$out/bin"
cp bin/godot.* $out/bin/godot
mkdir -p "$out/share/applications"
mkdir "$dev"
cp -r modules/gdnative/include $dev
mkdir -p "$man/share/man/man6"
cp misc/dist/linux/godot.6 "$man/share/man/man6/"
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
cp misc/dist/linux/godot.desktop "$out/share/applications/"
substituteInPlace "$out/share/applications/godot.desktop" \
--replace "Exec=godot" \
"Exec=$out/bin/godot"
mkdir -p "$out/share/icons/hicolor/scalable/apps/"
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
cp icon.png "$out/share/icons/godot.png"
mkdir -p "$out/share/man/man6"
cp misc/dist/linux/godot.6 "$out/share/man/man6/"
substituteInPlace "$out/share/applications/godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
'';
meta = {

View file

@ -2623,7 +2623,6 @@ with pkgs;
gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
godot = callPackage ../development/tools/godot {};
godot_headers = callPackage ../development/libraries/godot_headers {};
goklp = callPackage ../tools/networking/goklp {};