commit 464767cae5bd391bbd8f6b375fcafc2e4dc195c8 · pyrox.dev/nixpkgs

+7 -3

pkgs/os-specific/windows/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         config,

     

       3
       4
        
         stdenv,

     

       4
       5
        
         buildPackages,

     

       5
       6
        
         pkgs,

     
···

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       lib.makeScope newScope (

     

       12
       12
       -
         self: with self; {

     

       13
       13
       +
         self:

     

       14
       14
       +
         with self;

     

       15
       15
       +
         {

     

       13
       16
        
           dlfcn = callPackage ./dlfcn { };

     

       14
       17
        
       

     

       15
       18
        
           mingw_w64 = callPackage ./mingw-w64 {

     
···

       31
       34
        
       

     

       32
       35
        
           mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };

     

       33
       36
        
       

     

       34
       34
       -
           mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;

     

       35
       35
       -
       

     

       36
       37
        
           mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };

     

       37
       38
        
       

     

       38
       39
        
           npiperelay = callPackage ./npiperelay { };

     
···

       42
       43
        
           libgnurx = callPackage ./libgnurx { };

     

       43
       44
        
       

     

       44
       45
        
           sdk = callPackage ./msvcSdk { };

     

       46
       46
       +
         }

     

       47
       47
       +
         // lib.optionalAttrs config.allowAliases {

     

       48
       48
       +
           mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;

     

       45
       49
        
         }

     

       46
       50
        
       )

+83 -81

pkgs/os-specific/windows/msvcSdk/default.nix

···

       24
       24
        
           else

     

       25
       25
        
             throw "Unsupported system";

     

       26
       26
        
       in

     

       27
       27
       -
       if !config.microsoftVisualStudioLicenseAccepted then

     

       28
       28
       -
         throw ''

     

       29
       29
       -
           Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.

     

       30
       30
       -
           Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your

     

       31
       31
       -
           config to indicate so.

     

       32
       32
       -
         ''

     

       33
       33
       -
       else

     

       34
       34
       -
         stdenvNoCC.mkDerivation (finalAttrs: {

     

       35
       35
       -
           inherit version;

     

       36
       36
       -
           pname = "msvc-sdk";

     

       37
       37
       -
           dontUnpack = true;

     

       27
       27
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       28
       28
       +
         inherit version;

     

       29
       29
       +
         pname = "msvc-sdk";

     

       30
       30
       +
         dontUnpack = true;

     

       38
       31
        
       

     

       39
       39
       -
           strictDeps = true;

     

       40
       40
       -
           nativeBuildInputs = [ xwin ];

     

       32
       32
       +
         strictDeps = true;

     

       33
       33
       +
         nativeBuildInputs = [ xwin ];

     

       41
       34
        
       

     

       42
       42
       -
           outputHashAlgo = "sha256";

     

       43
       43
       -
           outputHashMode = "recursive";

     

       44
       44
       -
           outputHash = hashes.${arch};

     

       35
       35
       +
         outputHashAlgo = "sha256";

     

       36
       36
       +
         outputHashMode = "recursive";

     

       37
       37
       +
         outputHash =

     

       38
       38
       +
           if !config.microsoftVisualStudioLicenseAccepted then

     

       39
       39
       +
             throw ''

     

       40
       40
       +
               Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.

     

       41
       41
       +
               Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your

     

       42
       42
       +
               config to indicate so.

     

       43
       43
       +
             ''

     

       44
       44
       +
           else

     

       45
       45
       +
             hashes.${arch};

     

       45
       46
        
       

     

       46
       46
       -
           __structuredAttrs = true;

     

       47
       47
       -
           xwinArgs = [

     

       48
       48
       -
             "--accept-license"

     

       49
       49
       -
             "--cache-dir=xwin-out"

     

       50
       50
       -
             "--manifest=${./manifest.json}"

     

       51
       51
       -
             "--arch=${arch}"

     

       52
       52
       -
             "splat"

     

       53
       53
       -
             "--preserve-ms-arch-notation"

     

       54
       54
       -
           ];

     

       47
       47
       +
         __structuredAttrs = true;

     

       48
       48
       +
         xwinArgs = [

     

       49
       49
       +
           "--accept-license"

     

       50
       50
       +
           "--cache-dir=xwin-out"

     

       51
       51
       +
           "--manifest=${./manifest.json}"

     

       52
       52
       +
           "--arch=${arch}"

     

       53
       53
       +
           "splat"

     

       54
       54
       +
           "--preserve-ms-arch-notation"

     

       55
       55
       +
         ];

     

       55
       56
        
       

     

       56
       56
       -
           buildPhase = ''

     

       57
       57
       -
             runHook preBuild

     

       57
       57
       +
         buildPhase = ''

     

       58
       58
       +
           runHook preBuild

     

       58
       59
        
       

     

       59
       59
       -
             xwin "''${xwinArgs[@]}"

     

       60
       60
       -
             mkdir "$out"

     

       61
       61
       -
             mv xwin-out/splat/* "$out"

     

       60
       60
       +
           xwin "''${xwinArgs[@]}"

     

       61
       61
       +
           mkdir "$out"

     

       62
       62
       +
           mv xwin-out/splat/* "$out"

     

       62
       63
        
       

     

       63
       63
       -
             runHook postBuild

     

       64
       64
       -
           '';

     

       64
       64
       +
           runHook postBuild

     

       65
       65
       +
         '';

     

       65
       66
        
       

     

       66
       66
       -
           dontFixup = true;

     

       67
       67
       -
           dontInstall = true;

     

       67
       67
       +
         dontFixup = true;

     

       68
       68
       +
         dontInstall = true;

     

       68
       69
        
       

     

       69
       69
       -
           passthru = {

     

       70
       70
       -
             updateScript = ./update.nu;

     

       71
       71
       -
             tests = {

     

       72
       72
       -
               hello-world = testers.runCommand {

     

       73
       73
       -
                 name = "hello-msvc";

     

       70
       70
       +
         passthru = {

     

       71
       71
       +
           updateScript = ./update.nu;

     

       72
       72
       +
           tests = {

     

       73
       73
       +
             hello-world = testers.runCommand {

     

       74
       74
       +
               name = "hello-msvc";

     

       74
       75
        
       

     

       75
       75
       -
                 nativeBuildInputs = [

     

       76
       76
       -
                   llvmPackages.clang-unwrapped

     

       77
       77
       -
                   llvmPackages.bintools-unwrapped

     

       78
       78
       -
                 ];

     

       76
       76
       +
               nativeBuildInputs = [

     

       77
       77
       +
                 llvmPackages.clang-unwrapped

     

       78
       78
       +
                 llvmPackages.bintools-unwrapped

     

       79
       79
       +
               ];

     

       79
       80
        
       

     

       80
       80
       -
                 script = ''

     

       81
       81
       -
                   set -euo pipefail

     

       81
       81
       +
               script = ''

     

       82
       82
       +
                 set -euo pipefail

     

       82
       83
        
       

     

       83
       83
       -
                   cat > hello.c <<- EOF

     

       84
       84
       -
                   #include <stdio.h>

     

       84
       84
       +
                 cat > hello.c <<- EOF

     

       85
       85
       +
                 #include <stdio.h>

     

       85
       86
        
       

     

       86
       86
       -
                   int main(int argc, char* argv[]) {

     

       87
       87
       -
                       printf("Hello world!\n");

     

       88
       88
       -
                       return 0;

     

       89
       89
       -
                   }

     

       90
       90
       -
                   EOF

     

       87
       87
       +
                 int main(int argc, char* argv[]) {

     

       88
       88
       +
                     printf("Hello world!\n");

     

       89
       89
       +
                     return 0;

     

       90
       90
       +
                 }

     

       91
       91
       +
                 EOF

     

       91
       92
        
       

     

       92
       92
       -
                   clang-cl --target=x86_64-pc-windows-msvc -fuse-ld=lld \

     

       93
       93
       -
                       /vctoolsdir ${finalAttrs.finalPackage}/crt \

     

       94
       94
       -
                       /winsdkdir ${finalAttrs.finalPackage}/sdk \

     

       95
       95
       -
                       ./hello.c -v

     

       93
       93
       +
                 clang-cl --target=x86_64-pc-windows-msvc -fuse-ld=lld \

     

       94
       94
       +
                     /vctoolsdir ${finalAttrs.finalPackage}/crt \

     

       95
       95
       +
                     /winsdkdir ${finalAttrs.finalPackage}/sdk \

     

       96
       96
       +
                     ./hello.c -v

     

       96
       97
        
       

     

       97
       97
       -
                   if test ! -f hello.exe; then

     

       98
       98
       -
                     echo "hello.exe not found!"

     

       99
       99
       -
                     exit 1

     

       100
       100
       -
                   else

     

       101
       101
       -
                     touch $out

     

       102
       102
       -
                   fi

     

       103
       103
       -
                 '';

     

       104
       104
       -
               };

     

       98
       98
       +
                 if test ! -f hello.exe; then

     

       99
       99
       +
                   echo "hello.exe not found!"

     

       100
       100
       +
                   exit 1

     

       101
       101
       +
                 else

     

       102
       102
       +
                   touch $out

     

       103
       103
       +
                 fi

     

       104
       104
       +
               '';

     

       105
       105
        
             };

     

       106
       106
        
           };

     

       107
       107
       +
         };

     

       107
       108
        
       

     

       108
       108
       -
           meta = {

     

       109
       109
       -
             description = "MSVC SDK and Windows CRT for cross compiling";

     

       110
       110
       -
             homepage = "https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/";

     

       111
       111
       -
             maintainers = [ lib.maintainers.RossSmyth ];

     

       112
       112
       -
             license = {

     

       113
       113
       -
               deprecated = false;

     

       114
       114
       -
               fullName = "Microsoft Software License Terms";

     

       115
       115
       -
               shortName = "msvc";

     

       116
       116
       -
               spdxId = "unknown";

     

       117
       117
       -
               url = "https://www.visualstudio.com/license-terms/mt644918/";

     

       118
       118
       -
             };

     

       119
       119
       -
             platforms = lib.platforms.all;

     

       120
       120
       -
             # The arm32 manifest is missing critical pieces.

     

       121
       121
       -
             broken = stdenvNoCC.hostPlatform.isAarch32;

     

       122
       122
       -
             sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

     

       123
       123
       -
             teams = [ lib.teams.windows ];

     

       109
       109
       +
         meta = {

     

       110
       110
       +
           description = "MSVC SDK and Windows CRT for cross compiling";

     

       111
       111
       +
           homepage = "https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/";

     

       112
       112
       +
           maintainers = [ lib.maintainers.RossSmyth ];

     

       113
       113
       +
           license = {

     

       114
       114
       +
             deprecated = false;

     

       115
       115
       +
             fullName = "Microsoft Software License Terms";

     

       116
       116
       +
             shortName = "msvc";

     

       117
       117
       +
             spdxId = "unknown";

     

       118
       118
       +
             free = false;

     

       119
       119
       +
             url = "https://www.visualstudio.com/license-terms/mt644918/";

     

       124
       120
        
           };

     

       125
       125
       -
         })

     

       121
       121
       +
           platforms = lib.platforms.all;

     

       122
       122
       +
           # The arm32 manifest is missing critical pieces.

     

       123
       123
       +
           broken = stdenvNoCC.hostPlatform.isAarch32;

     

       124
       124
       +
           sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

     

       125
       125
       +
           teams = [ lib.teams.windows ];

     

       126
       126
       +
         };

     

       127
       127
       +
       })