commit 3a6efadba0c606c40320ff3f6e216277ffcbf196 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/libraries/libsodium/default.nix

···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

     

       12
       12
       -
         separateDebugInfo = stdenv.isLinux;

     

       12
       12
       +
         separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";

     

       13
       13
        
       

     

       14
       14
        
         enableParallelBuilding = true;

     

       15
       15

+12 -1

pkgs/top-level/static.nix

···

       115
       115
        
           static = true;

     

       116
       116
        
         };

     

       117
       117
        
         openblas = super.openblas.override { enableStatic = true; };

     

       118
       118
       -
         openssl = super.openssl.override {

     

       118
       118
       +
         nix = super.nix.override { withAWS = false; };

     

       119
       119
       +
         # openssl 1.1 doesn't compile

     

       120
       120
       +
         openssl = super.openssl_1_0_2.override {

     

       119
       121
        
           static = true;

     

       120
       122
        
       

     

       121
       123
        
           # Don’t use new stdenv for openssl because it doesn’t like the

     
···

       125
       127
        
         boost = super.boost.override {

     

       126
       128
        
           enableStatic = true;

     

       127
       129
        
           enableShared = false;

     

       130
       130
       +
       

     

       131
       131
       +
           # Don’t use new stdenv for boost because it doesn’t like the

     

       132
       132
       +
           # --disable-shared flag

     

       133
       133
       +
           stdenv = super.stdenv;

     

       128
       134
        
         };

     

       129
       135
        
         gmp = super.gmp.override {

     

       130
       136
        
           withStatic = true;

     
···

       157
       163
        
             enableShared = false;

     

       158
       164
        
             enableStatic = true;

     

       159
       165
        
           };

     

       166
       166
       +
         };

     

       167
       167
       +
       

     

       168
       168
       +
         curl = super.curl.override {

     

       169
       169
       +
           # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039

     

       170
       170
       +
           gssSupport = false;

     

       160
       171
        
         };

     

       161
       172
        
       

     

       162
       173
        
         brotli = super.brotli.override {