commit 048724c4affebacbc4bd40d1a667ba6a7551fdd0 · pyrox.dev/nixpkgs

+23

pkgs/development/libraries/godot_headers/default.nix

···

       1
       +
       { stdenv, fetchFromGitHub }:

     

       2
       +
       stdenv.mkDerivation rec {

     

       3
       +
         name = "godot_headers";

     

       4
       +
         version = "2018-02-09";

     

       5
       +
         src = fetchFromGitHub {

     

       6
       +
           owner = "GodotNativeTools";

     

       7
       +
           repo = "godot_headers";

     

       8
       +
           rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";

     

       9
       +
           sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";

     

       10
       +
         };

     

       11
       +
         buildPhase = "true";

     

       12
       +
         installPhase = ''

     

       13
       +
           mkdir $out

     

       14
       +
           cp -r . $out/include

     

       15
       +
         '';

     

       16
       +
         meta = {

     

       17
       +
           homepage = "https://github.com/GodotNativeTools/godot_headers/";

     

       18
       +
           description = "Headers for the Godot API supplied by the GDNative module";

     

       19
       +
           license = stdenv.lib.licenses.mit;

     

       20
       +
           platforms = stdenv.lib.platforms.all;

     

       21
       +
           maintainers = [ stdenv.lib.maintainers.twey ];

     

       22
       +
         };

     

       23
       +
       }

+26 -13

pkgs/development/tools/godot/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor

     

       2
       -
       , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib

     

       3
       -
       , libpulseaudio, libGLU, zlib }:

     

       0
        
       
     

       4
        
       

     

       5
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
         name    = "godot-${version}";

     

       7
       -
         version = "2.1.4";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner  = "godotengine";

     

       11
        
           repo   = "godot";

     

       12
        
           rev    = "${version}-stable";

     

       13
       -
           sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
        
         buildInputs = [

     

       18
       -
           gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender

     

       19
       -
           freetype openssl alsaLib libpulseaudio libGLU zlib

     

       0
        
       
     

       20
        
         ];

     

       21
        
       

     

       22
       -
         patches = [ ./pkg_config_additions.patch ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
       

     

       24
        
         enableParallelBuilding = true;

     

       25
        
       

     

       26
        
         buildPhase = ''

     

       27
       -
           scons platform=x11 prefix=$out -j $NIX_BUILD_CORES

     

       0
        
       
     

       0
        
       
     

       28
        
         '';

     

       29
        
       

     

       30
        
         installPhase = ''

     

       31
       -
           mkdir $out/bin -p

     

       32
       -
           cp bin/godot.* $out/bin/

     

       33
        
         '';

     

       34
        
       

     

       35
        
         meta = {

     

       36
        
           homepage    = "https://godotengine.org";

     

       37
        
           description = "Free and Open Source 2D and 3D game engine";

     

       38
        
           license     = stdenv.lib.licenses.mit;

     

       39
       -
           platforms   = stdenv.lib.platforms.linux;

     

       0
        
       
     

       40
        
         };

     

       41
        
       }

···

       1
       +
       { stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor

     

       2
       +
       , libXinerama, libXrandr, libXrender, libpulseaudio ? null

     

       3
       +
       , libXi ? null, libXext, libXfixes, freetype, openssl

     

       4
       +
       , alsaLib, libGLU, zlib, yasm ? null }:

     

       5
        
       

     

       6
       +
       let

     

       7
       +
         options = {

     

       8
       +
           touch = libXi != null;

     

       9
       +
           pulseaudio = false;

     

       10
       +
         };

     

       11
       +
       in stdenv.mkDerivation rec {

     

       12
        
         name    = "godot-${version}";

     

       13
       +
         version = "3.0.2";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner  = "godotengine";

     

       17
        
           repo   = "godot";

     

       18
        
           rev    = "${version}-stable";

     

       19
       +
           sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [ pkgconfig ];

     

       23
        
         buildInputs = [

     

       24
       +
           scons libX11 libXcursor libXinerama libXrandr libXrender

     

       25
       +
           libXi libXext libXfixes freetype openssl alsaLib libpulseaudio

     

       26
       +
           libGLU zlib yasm

     

       27
        
         ];

     

       28
        
       

     

       29
       +
         patches = [

     

       30
       +
           ./pkg_config_additions.patch

     

       31
       +
           ./dont_clobber_environment.patch

     

       32
       +
         ];

     

       33
        
       

     

       34
        
         enableParallelBuilding = true;

     

       35
        
       

     

       36
        
         buildPhase = ''

     

       37
       +
           scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \

     

       38
       +
             ${lib.concatStringsSep " "

     

       39
       +
                 (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}

     

       40
        
         '';

     

       41
        
       

     

       42
        
         installPhase = ''

     

       43
       +
           mkdir -p $out/bin

     

       44
       +
           cp bin/godot.x11.tools.* $out/bin/godot

     

       45
        
         '';

     

       46
        
       

     

       47
        
         meta = {

     

       48
        
           homepage    = "https://godotengine.org";

     

       49
        
           description = "Free and Open Source 2D and 3D game engine";

     

       50
        
           license     = stdenv.lib.licenses.mit;

     

       51
       +
           platforms   = [ "i686-linux" "x86_64-linux" ];

     

       52
       +
           maintainers = [ stdenv.lib.maintainers.twey ];

     

       53
        
         };

     

       54
        
       }

+16

pkgs/development/tools/godot/dont_clobber_environment.patch

···

       1
       +
       +++ build/SConstruct

     

       2
       +
       @@ -69,10 +69,10 @@

     

       3
       +
                custom_tools = ['mingw']

     

       4
       +
        

     

       5
       +
        env_base = Environment(tools=custom_tools)

     

       6
       +
       -if 'TERM' in os.environ:

     

       7
       +
       -    env_base['ENV']['TERM'] = os.environ['TERM']

     

       8
       +
       -env_base.AppendENVPath('PATH', os.getenv('PATH'))

     

       9
       +
       -env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))

     

       10
       +
       +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):

     

       11
       +
       +    if (k in os.environ):

     

       12
       +
       +        env_base["ENV"][k] = os.environ[k]

     

       13
       +
       +

     

       14
       +
        env_base.global_defaults = global_defaults

     

       15
       +
        env_base.android_maven_repos = []

     

       16
       +
        env_base.android_flat_dirs = []

+8 -7

pkgs/development/tools/godot/pkg_config_additions.patch

···

       1
       -
       +++ build/platform/x11/detect.py

     

       2
       -
       @@ -139,6 +139,10 @@

     

       3
       -
            env.ParseConfig('pkg-config xinerama --cflags --libs')

     

       4
        
            env.ParseConfig('pkg-config xcursor --cflags --libs')

     

       0
        
       
     

       5
        
            env.ParseConfig('pkg-config xrandr --cflags --libs')

     

       6
        
       +    env.ParseConfig('pkg-config xrender --cflags --libs')

     

       7
       -
       +    env.ParseConfig('pkg-config oslibGLU_combined --cflags')

     

       0
        
       
     

       8
        
       +    env.ParseConfig('pkg-config glu --cflags --libs')

     

       9
        
       +    env.ParseConfig('pkg-config zlib --cflags --libs')

     

       10
       -
       

     

       11
       -
            if (env['builtin_openssl'] == 'no'):

     

       12
       -
                # Currently not compatible with OpenSSL 1.1.0+

···

       1
       +
       +++ b/platform/x11/detect.py

     

       2
       +
       @@ -142,6 +142,11 @@

     

       0
        
       
     

       3
        
            env.ParseConfig('pkg-config xcursor --cflags --libs')

     

       4
       +
            env.ParseConfig('pkg-config xinerama --cflags --libs')

     

       5
        
            env.ParseConfig('pkg-config xrandr --cflags --libs')

     

       6
        
       +    env.ParseConfig('pkg-config xrender --cflags --libs')

     

       7
       +
       +    env.ParseConfig('pkg-config xext --cflags --libs')

     

       8
       +
       +    env.ParseConfig('pkg-config xfixes --cflags --libs')

     

       9
        
       +    env.ParseConfig('pkg-config glu --cflags --libs')

     

       10
        
       +    env.ParseConfig('pkg-config zlib --cflags --libs')

     

       11
       +
        

     

       12
       +
            if (env['touch']):

     

       13
       +
                x11_error = os.system("pkg-config xi --modversion > /dev/null ")

+1

pkgs/top-level/all-packages.nix

···

       2574
        
         gocryptfs = callPackage ../tools/filesystems/gocrypfs { };

     

       2575
        
       

     

       2576
        
         godot = callPackage ../development/tools/godot {};

     

       0
        
       
     

       2577
        
       

     

       2578
        
         goklp = callPackage ../tools/networking/goklp {};

     

       2579

···

       2574
        
         gocryptfs = callPackage ../tools/filesystems/gocrypfs { };

     

       2575
        
       

     

       2576
        
         godot = callPackage ../development/tools/godot {};

     

       2577
       +
         godot_headers = callPackage ../development/libraries/godot_headers {};

     

       2578
        
       

     

       2579
        
         goklp = callPackage ../tools/networking/goklp {};

     

       2580