commit 026fdbbf82a6f70e6ad8b5f865a763757d5c2dae · pyrox.dev/nixpkgs

+3 -1

pkgs/by-name/si/signal-desktop/libsignal-node.nix

···

       70
       70
        
       

     

       71
       71
        
           substituteInPlace node/build_node_bridge.py \

     

       72
       72
        
             --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \

     

       73
       73
       -
                            "dst_base = '@signalapp+libsignal-client'"

     

       73
       73
       +
                            "dst_base = '@signalapp+libsignal-client'" \

     

       74
       74
       +
             --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \

     

       75
       75
       +
                            "objcopy = os.getenv('OBJCOPY', 'objcopy')"

     

       74
       76
        
         '';

     

       75
       77
        
       

     

       76
       78
        
         buildPhase = ''

+1 -1

pkgs/by-name/si/signal-desktop/package.nix

···

       199
       199
        
       

     

       200
       200
        
           pnpm run generate

     

       201
       201
        
           pnpm exec electron-builder \

     

       202
       202
       -
             --dir \

     

       202
       202
       +
             --linux "dir:${stdenv.hostPlatform.node.arch}" \

     

       203
       203
        
             --config.extraMetadata.environment=$SIGNAL_ENV \

     

       204
       204
        
             -c.electronDist=electron-dist \

     

       205
       205
        
             -c.electronVersion=${electron.version}

+1 -1

pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix

···

       47
       47
        
           runHook preBuild

     

       48
       48
        
       

     

       49
       49
        
           export npm_config_nodedir=${nodejs}

     

       50
       50
       -
           pnpm run prebuildify

     

       50
       50
       +
           pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"

     

       51
       51
        
           pnpm run build

     

       52
       52
        
       

     

       53
       53
        
           runHook postBuild

+37 -1

pkgs/by-name/si/signal-desktop/webrtc.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv,

     

       3
       3
        
         lib,

     

       4
       4
       +
         buildPackages,

     

       4
       5
        
         ninja,

     

       5
       6
        
         gn,

     

       6
       7
        
         python3,

     
···

       13
       14
        
         rustc,

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       17
       17
       +
       let

     

       18
       18
       +
         chromiumRosettaStone = {

     

       19
       19
       +
           cpu =

     

       20
       20
       +
             platform:

     

       21
       21
       +
             let

     

       22
       22
       +
               name = platform.parsed.cpu.name;

     

       23
       23
       +
             in

     

       24
       24
       +
             (

     

       25
       25
       +
               {

     

       26
       26
       +
                 "x86_64" = "x64";

     

       27
       27
       +
                 "i686" = "x86";

     

       28
       28
       +
                 "arm" = "arm";

     

       29
       29
       +
                 "aarch64" = "arm64";

     

       30
       30
       +
               }

     

       31
       31
       +
               .${name} or (throw "no chromium Rosetta Stone entry for cpu: ${name}")

     

       32
       32
       +
             );

     

       33
       33
       +
         };

     

       34
       34
       +
       in

     

       16
       35
        
       stdenv.mkDerivation (finalAttrs: {

     

       17
       36
        
         pname = "signal-webrtc";

     

       18
       37
        
         version = finalAttrs.gclientDeps."src".path.rev;

     
···

       59
       78
        
         '';

     

       60
       79
        
       

     

       61
       80
        
         gnFlags = [

     

       81
       81
       +
           # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags

     

       82
       82
       +
           # are copied from pkgs/applications/networking/browsers/chromium/common.nix.

     

       62
       83
        
           ''target_os="linux"''

     

       84
       84
       +
           ''target_cpu="${chromiumRosettaStone.cpu stdenv.hostPlatform}"''

     

       85
       85
       +
           ''pkg_config="${stdenv.cc.targetPrefix}pkg-config"''

     

       63
       86
        
           "use_sysroot=false"

     

       64
       87
        
           "is_clang=false"

     

       65
       88
        
           "treat_warnings_as_errors=false"

     
···

       78
       101
        
           "rtc_include_tests=false"

     

       79
       102
        
           "rtc_enable_protobuf=false"

     

       80
       103
        
       

     

       81
       81
       -
           ''rust_sysroot_absolute="${rustc}"''

     

       104
       104
       +
           ''rust_sysroot_absolute="${buildPackages.rustc}"''

     

       105
       105
       +
       

     

       106
       106
       +
           # Build using the system toolchain (for Linux distributions):

     

       107
       107
       +
           #

     

       108
       108
       +
           # What you would expect to be called "target_toolchain" is

     

       109
       109
       +
           # actually called either "default_toolchain" or "custom_toolchain",

     

       110
       110
       +
           # depending on which part of the codebase you are in; see:

     

       111
       111
       +
           # https://chromium.googlesource.com/chromium/src/build/+/3c4595444cc6d514600414e468db432e0f05b40f/config/BUILDCONFIG.gn#17

     

       112
       112
       +
           ''custom_toolchain="//build/toolchain/linux/unbundle:default"''

     

       113
       113
       +
           ''host_toolchain="//build/toolchain/linux/unbundle:default"''

     

       114
       114
       +
         ]

     

       115
       115
       +
         ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       116
       116
       +
           ''host_toolchain="//build/toolchain/linux/unbundle:host"''

     

       117
       117
       +
           ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"''

     

       82
       118
        
         ];

     

       83
       119
        
         ninjaFlags = [ "webrtc" ];

     

       84
       120