commit e8096a7be9c9c1f59a7fdf192660f1bedd0a3c8c · ptr.pet/endpoint

+9 -8

nix/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         bun,

     

       4
       4
       +
         deno,

     

       5
       5
       +
         nodejs,

     

       5
       6
        
         makeBinaryWrapper,

     

       6
       7
        
         gazesys-modules,

     

       7
       8
        
         PUBLIC_BASE_URL ? "http://localhost:5173",

     
···

       14
       15
        
           fileset = lib.fileset.unions [

     

       15
       16
        
             ../src

     

       16
       17
        
             ../static

     

       17
       17
       -
             ../bun.lock

     

       18
       18
       +
             ../deno.lock

     

       18
       19
        
             ../package.json

     

       19
       20
        
             ../postcss.config.js

     

       20
       21
        
             ../svelte.config.js

     
···

       25
       26
        
         };

     

       26
       27
        
       

     

       27
       28
        
         nativeBuildInputs = [makeBinaryWrapper];

     

       28
       28
       -
         buildInputs = [bun];

     

       29
       29
       +
         buildInputs = [deno];

     

       29
       30
        
       

     

       30
       31
        
         inherit PUBLIC_BASE_URL;

     

       31
       32
        
       

     
···

       36
       37
        
           cp -R --no-preserve=ownership ${gazesys-modules} node_modules

     

       37
       38
        
           find node_modules -type d -exec chmod 755 {} \;

     

       38
       39
        
           substituteInPlace node_modules/.bin/vite \

     

       39
       39
       -
             --replace-fail "/usr/bin/env node" "${bun}/bin/bun --bun"

     

       40
       40
       +
             --replace-fail "/usr/bin/env node" "${nodejs}/bin/node"

     

       40
       41
        
           runHook postConfigure

     

       41
       42
        
         '';

     

       42
       43
        
         buildPhase = ''

     

       43
       44
        
           runHook preBuild

     

       44
       44
       -
           bun --prefer-offline run build

     

       45
       45
       +
           HOME=$TMPDIR deno run --cached-only build

     

       45
       46
        
           runHook postBuild

     

       46
       47
        
         '';

     

       47
       48
        
         installPhase = ''

     
···

       51
       52
        
           cp -R ./build/* $out

     

       52
       53
        
           cp -R ./node_modules $out

     

       53
       54
        
       

     

       54
       54
       -
           makeBinaryWrapper ${bun}/bin/bun $out/bin/website \

     

       55
       55
       -
             --prefix PATH : ${lib.makeBinPath [ bun ]} \

     

       56
       56
       -
             --add-flags "run --bun --no-install --cwd $out start"

     

       55
       55
       +
           makeBinaryWrapper ${deno}/bin/deno $out/bin/website \

     

       56
       56
       +
             --prefix PATH : ${lib.makeBinPath [ deno ]} \

     

       57
       57
       +
             --add-flags "run --allow-all --node-modules-dir=manual --cached-only $out/index.js"

     

       57
       58
        
       

     

       58
       59
        
           runHook postInstall

     

       59
       60
        
         '';

+8 -9

nix/modules.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         bun,

     

       4
       4
       +
         deno,

     

       5
       5
        
       }:

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = "gazesys-modules";

     
···

       9
       9
        
         src = lib.fileset.toSource {

     

       10
       10
        
           root = ../.;

     

       11
       11
        
           fileset = lib.fileset.unions [

     

       12
       12
       -
             ../bun.lock

     

       12
       12
       +
             ../deno.lock

     

       13
       13
        
             ../package.json

     

       14
       14
        
           ];

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         outputHash = "sha256-XqJ32vIa7ex+SpOaK8Qh4YRSffN6ekvwb9bddREGAOA=";

     

       17
       17
       +
         outputHash = "sha256-FhJT1CR5FyGlWMYjGDQDSebXtPWdRvDn5DR/rtk/T+4=";

     

       18
       18
        
         outputHashAlgo = "sha256";

     

       19
       19
        
         outputHashMode = "recursive";

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [bun];

     

       21
       21
       +
         nativeBuildInputs = [deno];

     

       22
       22
        
       

     

       23
       23
        
         dontConfigure = true;

     

       24
       24
        
         dontCheck = true;

     

       25
       25
        
         dontFixup = true;

     

       26
       26
        
         dontPatchShebangs = true;

     

       27
       27
        
       

     

       28
       28
       -
         buildPhase = "bun install --no-cache --no-progress --frozen-lockfile";

     

       28
       28
       +
         buildPhase = ''

     

       29
       29
       +
           HOME=$TMPDIR deno install --allow-scripts=npm:protobufjs@7.5.4 --frozen --seed 8008135

     

       30
       30
       +
         '';

     

       29
       31
        
         installPhase = ''

     

       30
       30
       -
           mkdir -p $out

     

       31
       31
       -
       

     

       32
       32
       -
           cp -R ./node_modules/* $out

     

       33
       33
       -
           cp -R ./node_modules/.bin $out

     

       32
       32
       +
           cp -R node_modules $out

     

       34
       33
        
           ls -la $out

     

       35
       34
        
         '';

     

       36
       35
        
       }