commit 96c31456d59b42898cb7ca01bf07bc91b896bfb1 · pyrox.dev/nixpkgs

+25

pkgs/development/tools/godot/Linux-fix-missing-library-with-builtin_glslang-false.patch

···

       1
       +
       From 6d43e80c0a455fea5dcb656967e73f755ecdd645 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: David McFarland <corngood@gmail.com>

     

       3
       +
       Date: Sun, 9 Mar 2025 19:42:33 -0300

     

       4
       +
       Subject: [PATCH] Linux: fix missing library with builtin_glslang=false

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        platform/linuxbsd/detect.py | 2 +-

     

       8
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       +
       

     

       10
       +
       diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py

     

       11
       +
       index b5e80f4a4d..8389096e26 100644

     

       12
       +
       --- a/platform/linuxbsd/detect.py

     

       13
       +
       +++ b/platform/linuxbsd/detect.py

     

       14
       +
       @@ -472,7 +472,7 @@ def configure(env: "SConsEnvironment"):

     

       15
       +
                    env.ParseConfig("pkg-config vulkan --cflags --libs")

     

       16
       +
                if not env["builtin_glslang"]:

     

       17
       +
                    # No pkgconfig file so far, hardcode expected lib name.

     

       18
       +
       -            env.Append(LIBS=["glslang", "SPIRV"])

     

       19
       +
       +            env.Append(LIBS=["glslang", "glslang-default-resource-limits", "SPIRV"])

     

       20
       +
        

     

       21
       +
            if env["opengl3"]:

     

       22
       +
                env.Append(CPPDEFINES=["GLES3_ENABLED"])

     

       23
       +
       -- 

     

       24
       +
       2.47.1

     

       25
       +

+105 -42

pkgs/development/tools/godot/common.nix

···

       5
        
         callPackage,

     

       6
        
         dbus,

     

       7
        
         dotnetCorePackages,

     

       0
        
       
     

       0
        
       
     

       8
        
         exportTemplatesHash,

     

       9
        
         fetchFromGitHub,

     

       10
        
         fetchpatch,

     

       11
        
         fontconfig,

     

       0
        
       
     

       12
        
         glib,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
         hash,

     

       0
        
       
     

       14
        
         installShellFiles,

     

       15
        
         lib,

     

       16
        
         libdecor,

     

       17
        
         libGL,

     

       0
        
       
     

       18
        
         libpulseaudio,

     

       0
        
       
     

       0
        
       
     

       19
        
         libX11,

     

       20
        
         libXcursor,

     

       21
        
         libXext,

     
···

       26
        
         libXrandr,

     

       27
        
         libXrender,

     

       28
        
         makeWrapper,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       29
        
         perl,

     

       30
        
         pkg-config,

     

       0
        
       
     

       31
        
         runCommand,

     

       32
        
         scons,

     

       0
        
       
     

       33
        
         speechd-minimal,

     

       34
        
         stdenv,

     

       35
        
         stdenvNoCC,

     
···

       55
        
         # https://github.com/godotengine/godot/pull/73504

     

       56
        
         withWayland ? true,

     

       57
        
         withX11 ? true,

     

       0
        
       
     

       0
        
       
     

       58
        
       }:

     

       59
        
       assert lib.asserts.assertOneOf "withPrecision" withPrecision [

     

       60
        
         "single"

     
···

       369
        
                   ccflags = "-fno-strict-aliasing";

     

       370
        
                   linkflags = "-Wl,--build-id";

     

       371
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       372
        
                   use_sowrap = false;

     

       373
        
                 }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       374
        
                 // lib.optionalAttrs (lib.versionAtLeast version "4.5") {

     

       375
        
                   redirect_build_objects = false; # Avoid copying build objects to output

     

       376
        
                 }

     
···

       380
        
       

     

       381
        
               strictDeps = true;

     

       382
        
       

     

       383
       -
               patches =

     

       384
       -
                 lib.optionals (lib.versionOlder version "4.4") [

     

       385
       -
                   (fetchpatch {

     

       386
       -
                     name = "wayland-header-fix.patch";

     

       387
       -
                     url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";

     

       388
       -
                     hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";

     

       389
       -
                   })

     

       390
       -
                   # Fix a crash in the mono test project build. It no longer seems to

     

       391
       -
                   # happen in 4.4, but an existing fix couldn't be identified.

     

       392
       -
                   ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch

     

       393
       -
                 ]

     

       394
       -
                 ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch;

     

       0
        
       
     

       0
        
       
     

       395
        
       

     

       396
        
               postPatch = ''

     

       397
        
                 # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE

     

       398
        
                 perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       399
        
       

     

       400
        
                 substituteInPlace thirdparty/glad/egl.c \

     

       401
        
                   --replace-fail \

     
···

       423
        
                 pkg-config

     

       424
        
               ];

     

       425
        
       

     

       426
       -
               buildInputs =

     

       427
       -
                 lib.optionals (editor && withMono) dotnet-sdk.packages

     

       428
       -
                 ++ lib.optional withAlsa alsa-lib

     

       429
       -
                 ++ lib.optional (withX11 || withWayland) libxkbcommon

     

       430
       -
                 ++ lib.optionals withX11 [

     

       431
       -
                   libX11

     

       432
       -
                   libXcursor

     

       433
       -
                   libXext

     

       434
       -
                   libXfixes

     

       435
       -
                   libXi

     

       436
       -
                   libXinerama

     

       437
       -
                   libXrandr

     

       438
       -
                   libXrender

     

       439
       -
                 ]

     

       440
       -
                 ++ lib.optionals withWayland [

     

       441
       -
                   # libdecor

     

       442
       -
                   wayland

     

       443
       -
                 ]

     

       444
       -
                 ++ lib.optionals withDbus [

     

       445
       -
                   dbus

     

       446
       -
                 ]

     

       447
       -
                 ++ lib.optionals withFontconfig [

     

       448
       -
                   fontconfig

     

       449
       -
                 ]

     

       450
       -
                 ++ lib.optional withPulseaudio libpulseaudio

     

       451
       -
                 ++ lib.optionals withSpeechd [

     

       452
       -
                   speechd-minimal

     

       453
       -
                   glib

     

       454
       -
                 ]

     

       455
       -
                 ++ lib.optional withUdev udev;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       456
        
       

     

       457
        
               nativeBuildInputs = [

     

       458
        
                 installShellFiles

···

       5
        
         callPackage,

     

       6
        
         dbus,

     

       7
        
         dotnetCorePackages,

     

       8
       +
         embree,

     

       9
       +
         enet,

     

       10
        
         exportTemplatesHash,

     

       11
        
         fetchFromGitHub,

     

       12
        
         fetchpatch,

     

       13
        
         fontconfig,

     

       14
       +
         freetype,

     

       15
        
         glib,

     

       16
       +
         glslang,

     

       17
       +
         graphite2,

     

       18
       +
         harfbuzz,

     

       19
        
         hash,

     

       20
       +
         icu,

     

       21
        
         installShellFiles,

     

       22
        
         lib,

     

       23
        
         libdecor,

     

       24
        
         libGL,

     

       25
       +
         libjpeg_turbo,

     

       26
        
         libpulseaudio,

     

       27
       +
         libtheora,

     

       28
       +
         libwebp,

     

       29
        
         libX11,

     

       30
        
         libXcursor,

     

       31
        
         libXext,

     
···

       36
        
         libXrandr,

     

       37
        
         libXrender,

     

       38
        
         makeWrapper,

     

       39
       +
         mbedtls,

     

       40
       +
         miniupnpc,

     

       41
       +
         openxr-loader,

     

       42
       +
         pcre2,

     

       43
        
         perl,

     

       44
        
         pkg-config,

     

       45
       +
         recastnavigation,

     

       46
        
         runCommand,

     

       47
        
         scons,

     

       48
       +
         sdl3,

     

       49
        
         speechd-minimal,

     

       50
        
         stdenv,

     

       51
        
         stdenvNoCC,

     
···

       71
        
         # https://github.com/godotengine/godot/pull/73504

     

       72
        
         withWayland ? true,

     

       73
        
         withX11 ? true,

     

       74
       +
         wslay,

     

       75
       +
         zstd,

     

       76
        
       }:

     

       77
        
       assert lib.asserts.assertOneOf "withPrecision" withPrecision [

     

       78
        
         "single"

     
···

       387
        
                   ccflags = "-fno-strict-aliasing";

     

       388
        
                   linkflags = "-Wl,--build-id";

     

       389
        
       

     

       390
       +
                   # libraries that aren't available in nixpkgs

     

       391
       +
                   builtin_msdfgen = true;

     

       392
       +
                   builtin_rvo2_2d = true;

     

       393
       +
                   builtin_rvo2_3d = true;

     

       394
       +
                   builtin_xatlas = true;

     

       395
       +
       

     

       396
       +
                   # using system clipper2 is currently not implemented

     

       397
       +
                   builtin_clipper2 = true;

     

       398
       +
       

     

       399
        
                   use_sowrap = false;

     

       400
        
                 }

     

       401
       +
                 // lib.optionalAttrs (lib.versionOlder version "4.4") {

     

       402
       +
                   # libraries that aren't available in nixpkgs

     

       403
       +
                   builtin_squish = true;

     

       404
       +
       

     

       405
       +
                   # broken with system packages

     

       406
       +
                   builtin_miniupnpc = true;

     

       407
       +
                 }

     

       408
        
                 // lib.optionalAttrs (lib.versionAtLeast version "4.5") {

     

       409
        
                   redirect_build_objects = false; # Avoid copying build objects to output

     

       410
        
                 }

     
···

       414
        
       

     

       415
        
               strictDeps = true;

     

       416
        
       

     

       417
       +
               patches = [

     

       418
       +
                 ./Linux-fix-missing-library-with-builtin_glslang-false.patch

     

       419
       +
               ]

     

       420
       +
               ++ lib.optionals (lib.versionOlder version "4.4") [

     

       421
       +
                 (fetchpatch {

     

       422
       +
                   name = "wayland-header-fix.patch";

     

       423
       +
                   url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";

     

       424
       +
                   hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";

     

       425
       +
                 })

     

       426
       +
                 # Fix a crash in the mono test project build. It no longer seems to

     

       427
       +
                 # happen in 4.4, but an existing fix couldn't be identified.

     

       428
       +
                 ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch

     

       429
       +
               ]

     

       430
       +
               ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch;

     

       431
        
       

     

       432
        
               postPatch = ''

     

       433
        
                 # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE

     

       434
        
                 perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct

     

       435
       +
       

     

       436
       +
                 # disable all builtin libraries by default

     

       437
       +
                 perl -pi -e '{ $r |= s:(opts.Add\(BoolVariable\("builtin_.*, )True(\)\)):\1False\2: } END { exit ($r != 1) }' SConstruct

     

       438
       +
       

     

       439
       +
                 substituteInPlace platform/linuxbsd/detect.py \

     

       440
       +
                   --replace-fail /usr/include/recastnavigation ${lib.escapeShellArg (lib.getDev recastnavigation)}/include/recastnavigation

     

       441
        
       

     

       442
        
                 substituteInPlace thirdparty/glad/egl.c \

     

       443
        
                   --replace-fail \

     
···

       465
        
                 pkg-config

     

       466
        
               ];

     

       467
        
       

     

       468
       +
               buildInputs = [

     

       469
       +
                 embree

     

       470
       +
                 enet

     

       471
       +
                 freetype

     

       472
       +
                 glslang

     

       473
       +
                 graphite2

     

       474
       +
                 (harfbuzz.override { withIcu = true; })

     

       475
       +
                 icu

     

       476
       +
                 libtheora

     

       477
       +
                 libwebp

     

       478
       +
                 mbedtls

     

       479
       +
                 miniupnpc

     

       480
       +
                 openxr-loader

     

       481
       +
                 pcre2

     

       482
       +
                 recastnavigation

     

       483
       +
                 wslay

     

       484
       +
                 zstd

     

       485
       +
               ]

     

       486
       +
               ++ lib.optionals (lib.versionAtLeast version "4.5") [

     

       487
       +
                 libjpeg_turbo

     

       488
       +
                 sdl3

     

       489
       +
               ]

     

       490
       +
               ++ lib.optionals (editor && withMono) dotnet-sdk.packages

     

       491
       +
               ++ lib.optional withAlsa alsa-lib

     

       492
       +
               ++ lib.optional (withX11 || withWayland) libxkbcommon

     

       493
       +
               ++ lib.optionals withX11 [

     

       494
       +
                 libX11

     

       495
       +
                 libXcursor

     

       496
       +
                 libXext

     

       497
       +
                 libXfixes

     

       498
       +
                 libXi

     

       499
       +
                 libXinerama

     

       500
       +
                 libXrandr

     

       501
       +
                 libXrender

     

       502
       +
               ]

     

       503
       +
               ++ lib.optionals withWayland [

     

       504
       +
                 libdecor

     

       505
       +
                 wayland

     

       506
       +
               ]

     

       507
       +
               ++ lib.optionals withDbus [

     

       508
       +
                 dbus

     

       509
       +
               ]

     

       510
       +
               ++ lib.optionals withFontconfig [

     

       511
       +
                 fontconfig

     

       512
       +
               ]

     

       513
       +
               ++ lib.optional withPulseaudio libpulseaudio

     

       514
       +
               ++ lib.optionals withSpeechd [

     

       515
       +
                 speechd-minimal

     

       516
       +
                 glib

     

       517
       +
               ]

     

       518
       +
               ++ lib.optional withUdev udev;

     

       519
        
       

     

       520
        
               nativeBuildInputs = [

     

       521
        
                 installShellFiles