commit ffde63de3be2ccf784e3783a3e1708908f8ff980 · pyrox.dev/nixpkgs

+12

pkgs/build-support/setup-hooks/move-build-tree.sh

···

       1
       1
       +
       prePhases+=" moveBuildDir"

     

       2
       2
       +
       

     

       3
       3
       +
       moveBuildDir() {

     

       4
       4
       +
           mkdir -p $out/.build

     

       5
       5
       +
           cd $out/.build

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       postPhases+=" removeBuildDir"

     

       9
       9
       +
       

     

       10
       10
       +
       removeBuildDir() {

     

       11
       11
       +
           rm -rf $out/.build

     

       12
       12
       +
       }

+2 -7

pkgs/development/libraries/qt-6/default.nix

···

       38
       38
        
               withGtk3 = true;

     

       39
       39
        
               inherit (srcs.qtbase) src version;

     

       40
       40
        
               inherit developerBuild;

     

       41
       41
       -
               inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;

     

       41
       41
       +
               inherit (darwin.apple_sdk_11_0.frameworks)

     

       42
       42
       +
                 AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit;

     

       42
       43
        
               patches = [

     

       43
       44
        
                 ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

     

       44
       45
        
                 ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

     
···

       46
       47
        
                 ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch

     

       47
       48
        
                 ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

     

       48
       49
        
                 ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

     

       49
       49
       -
                 # Remove symlink check causing build to bail out and fail.

     

       50
       50
       -
                 # https://gitlab.kitware.com/cmake/cmake/-/issues/23251

     

       51
       51
       -
                 (fetchpatch {

     

       52
       52
       -
                   url = "https://github.com/Homebrew/formula-patches/raw/c363f0edf9e90598d54bc3f4f1bacf95abbda282/qt/qt_internal_check_if_path_has_symlinks.patch";

     

       53
       53
       -
                   sha256 = "sha256-Gv2L8ymZSbJxcmUijKlT2NnkIB3bVH9D7YSsDX2noTU=";

     

       54
       54
       -
                 })

     

       55
       50
        
               ];

     

       56
       51
        
             };

     

       57
       52
        
             env = callPackage ./qt-env.nix { };

+9 -1

pkgs/development/libraries/qt-6/modules/qtbase.nix

···

       71
       71
        
       , unixODBC

     

       72
       72
        
       , unixODBCDrivers

     

       73
       73
        
         # darwin

     

       74
       74
       +
       , moveBuildTree

     

       74
       75
        
       , xcbuild

     

       75
       76
        
       , AGL

     

       76
       77
        
       , AVFoundation

     

       77
       78
        
       , AppKit

     

       79
       79
       +
       , Contacts

     

       80
       80
       +
       , CoreBluetooth

     

       81
       81
       +
       , EventKit

     

       78
       82
        
       , GSS

     

       79
       83
        
       , MetalKit

     

       80
       84
        
         # optional dependencies

     
···

       166
       170
        
           AGL

     

       167
       171
        
           AVFoundation

     

       168
       172
        
           AppKit

     

       173
       173
       +
           Contacts

     

       174
       174
       +
           CoreBluetooth

     

       175
       175
       +
           EventKit

     

       169
       176
        
           GSS

     

       170
       177
        
           MetalKit

     

       171
       178
        
         ] ++ lib.optional libGLSupported libGL;

     
···

       184
       191
        
         ++ lib.optional (libmysqlclient != null) libmysqlclient

     

       185
       192
        
         ++ lib.optional (postgresql != null) postgresql;

     

       186
       193
        
       

     

       187
       187
       -
         nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ];

     

       194
       194
       +
         nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ]

     

       195
       195
       +
           ++ lib.optionals stdenv.isDarwin [ moveBuildTree ];

     

       188
       196
        
       

     

       189
       197
        
         propagatedNativeBuildInputs = [ lndir ];

     

       190
       198

+3 -1

pkgs/development/libraries/qt-6/qtModule.nix

···

       3
       3
        
       , cmake

     

       4
       4
        
       , ninja

     

       5
       5
        
       , perl

     

       6
       6
       +
       , moveBuildTree

     

       6
       7
        
       , srcs

     

       7
       8
        
       , patches ? [ ]

     

       8
       9
        
       }:

     
···

       19
       20
        
         patches = args.patches or patches.${pname} or [ ];

     

       20
       21
        
       

     

       21
       22
        
         buildInputs = args.buildInputs or [ ];

     

       22
       22
       -
         nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ];

     

       23
       23
       +
         nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ]

     

       24
       24
       +
           ++ lib.optionals stdenv.isDarwin [ moveBuildTree ];

     

       23
       25
        
         propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);

     

       24
       26
        
       

     

       25
       27
        
         moveToDev = false;

+4

pkgs/top-level/all-packages.nix

···

       1173
       1173
        
           name = "keep-build-tree-hook";

     

       1174
       1174
        
         } ../build-support/setup-hooks/keep-build-tree.sh;

     

       1175
       1175
        
       

     

       1176
       1176
       +
         moveBuildTree = makeSetupHook {

     

       1177
       1177
       +
           name = "move-build-tree-hook";

     

       1178
       1178
       +
         } ../build-support/setup-hooks/move-build-tree.sh;

     

       1179
       1179
       +
       

     

       1176
       1180
        
         enableGCOVInstrumentation = makeSetupHook {

     

       1177
       1181
        
           name = "enable-gcov-instrumentation-hook";

     

       1178
       1182
        
         } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;