commit 7fb8e047f7c2d753c86e1afcbacdaee3eb38109f · notnite.com/moonlight

+4 -73

flake.lock

···

       18
        
               "type": "github"

     

       19
        
             }

     

       20
        
           },

     

       21
       -
           "flake-utils_2": {

     

       22
       -
             "inputs": {

     

       23
       -
               "systems": "systems_2"

     

       24
       -
             },

     

       25
       -
             "locked": {

     

       26
       -
               "lastModified": 1701680307,

     

       27
       -
               "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",

     

       28
       -
               "owner": "numtide",

     

       29
       -
               "repo": "flake-utils",

     

       30
       -
               "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",

     

       31
       -
               "type": "github"

     

       32
       -
             },

     

       33
       -
             "original": {

     

       34
       -
               "owner": "numtide",

     

       35
       -
               "repo": "flake-utils",

     

       36
       -
               "type": "github"

     

       37
       -
             }

     

       38
       -
           },

     

       39
        
           "nixpkgs": {

     

       40
        
             "locked": {

     

       41
       -
               "lastModified": 1728067476,

     

       42
       -
               "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",

     

       43
        
               "owner": "NixOS",

     

       44
        
               "repo": "nixpkgs",

     

       45
       -
               "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",

     

       46
        
               "type": "github"

     

       47
        
             },

     

       48
        
             "original": {

     

       49
        
               "owner": "NixOS",

     

       50
       -
               "ref": "nixos-24.05",

     

       51
       -
               "repo": "nixpkgs",

     

       52
       -
               "type": "github"

     

       53
       -
             }

     

       54
       -
           },

     

       55
       -
           "nixpkgs_2": {

     

       56
       -
             "locked": {

     

       57
       -
               "lastModified": 1736344531,

     

       58
       -
               "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",

     

       59
       -
               "owner": "nixos",

     

       60
       -
               "repo": "nixpkgs",

     

       61
       -
               "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",

     

       62
       -
               "type": "github"

     

       63
       -
             },

     

       64
       -
             "original": {

     

       65
       -
               "owner": "nixos",

     

       66
        
               "ref": "nixos-unstable",

     

       67
        
               "repo": "nixpkgs",

     

       68
        
               "type": "github"

     

       69
        
             }

     

       70
        
           },

     

       71
       -
           "pnpm2nix": {

     

       72
       -
             "inputs": {

     

       73
       -
               "flake-utils": "flake-utils_2",

     

       74
       -
               "nixpkgs": "nixpkgs_2"

     

       75
       -
             },

     

       76
       -
             "locked": {

     

       77
       -
               "lastModified": 1736457458,

     

       78
       -
               "narHash": "sha256-eiw+hAsxavEgBfhwrktNI2hwvgeVDzBDYClx/yqka78=",

     

       79
       -
               "owner": "NotNite",

     

       80
       -
               "repo": "pnpm2nix-nzbr",

     

       81
       -
               "rev": "4ac61c6a50623da937dca005e3dbcb8862aafb83",

     

       82
       -
               "type": "github"

     

       83
       -
             },

     

       84
       -
             "original": {

     

       85
       -
               "owner": "NotNite",

     

       86
       -
               "repo": "pnpm2nix-nzbr",

     

       87
       -
               "type": "github"

     

       88
       -
             }

     

       89
       -
           },

     

       90
        
           "root": {

     

       91
        
             "inputs": {

     

       92
        
               "flake-utils": "flake-utils",

     

       93
       -
               "nixpkgs": "nixpkgs",

     

       94
       -
               "pnpm2nix": "pnpm2nix"

     

       95
        
             }

     

       96
        
           },

     

       97
        
           "systems": {

     

       98
       -
             "locked": {

     

       99
       -
               "lastModified": 1681028828,

     

       100
       -
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       101
       -
               "owner": "nix-systems",

     

       102
       -
               "repo": "default",

     

       103
       -
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       104
       -
               "type": "github"

     

       105
       -
             },

     

       106
       -
             "original": {

     

       107
       -
               "owner": "nix-systems",

     

       108
       -
               "repo": "default",

     

       109
       -
               "type": "github"

     

       110
       -
             }

     

       111
       -
           },

     

       112
       -
           "systems_2": {

     

       113
        
             "locked": {

     

       114
        
               "lastModified": 1681028828,

     

       115
        
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

···

       18
        
               "type": "github"

     

       19
        
             }

     

       20
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
           "nixpkgs": {

     

       22
        
             "locked": {

     

       23
       +
               "lastModified": 1744232761,

     

       24
       +
               "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",

     

       25
        
               "owner": "NixOS",

     

       26
        
               "repo": "nixpkgs",

     

       27
       +
               "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",

     

       28
        
               "type": "github"

     

       29
        
             },

     

       30
        
             "original": {

     

       31
        
               "owner": "NixOS",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
               "ref": "nixos-unstable",

     

       33
        
               "repo": "nixpkgs",

     

       34
        
               "type": "github"

     

       35
        
             }

     

       36
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
           "root": {

     

       38
        
             "inputs": {

     

       39
        
               "flake-utils": "flake-utils",

     

       40
       +
               "nixpkgs": "nixpkgs"

     

       0
        
       
     

       41
        
             }

     

       42
        
           },

     

       43
        
           "systems": {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
             "locked": {

     

       45
        
               "lastModified": 1681028828,

     

       46
        
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

+3 -4

flake.nix

···

       2
        
         description = "Yet another Discord mod";

     

       3
        
       

     

       4
        
         inputs = {

     

       5
       -
           nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";

     

       6
        
           flake-utils.url = "github:numtide/flake-utils";

     

       7
       -
           pnpm2nix.url = "github:NotNite/pnpm2nix-nzbr";

     

       8
        
         };

     

       9
        
       

     

       10
       -
         outputs = { self, nixpkgs, flake-utils, pnpm2nix }:

     

       11
       -
           let overlay = import ./nix/overlay.nix { inherit pnpm2nix; };

     

       12
        
           in flake-utils.lib.eachDefaultSystem (system:

     

       13
        
             let

     

       14
        
               pkgs = import nixpkgs {

···

       2
        
         description = "Yet another Discord mod";

     

       3
        
       

     

       4
        
         inputs = {

     

       5
       +
           nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

     

       6
        
           flake-utils.url = "github:numtide/flake-utils";

     

       0
        
       
     

       7
        
         };

     

       8
        
       

     

       9
       +
         outputs = { self, nixpkgs, flake-utils }:

     

       10
       +
           let overlay = import ./nix/overlay.nix { };

     

       11
        
           in flake-utils.lib.eachDefaultSystem (system:

     

       12
        
             let

     

       13
        
               pkgs = import nixpkgs {

+40 -17

nix/default.nix

···

       1
       -
       { pkgs, mkPnpmPackage }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
       -
       mkPnpmPackage rec {

     

       4
       -
         workspace = ./..;

     

       5
        
         src = ./..;

     

       6
        
       

     

       7
       -
         # Work around a bug with how it expects dist

     

       8
       -
         components = [

     

       9
       -
           "packages/core"

     

       10
       -
           "packages/core-extensions"

     

       11
       -
           "packages/injector"

     

       12
       -
           "packages/node-preload"

     

       13
       -
           "packages/types"

     

       14
       -
           "packages/web-preload"

     

       15
        
         ];

     

       16
       -
         distDirs = [ "dist" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
       

     

       18
       -
         copyNodeModules = true;

     

       19
       -
         buildPhase = "pnpm run build";

     

       20
       -
         installPhase = "cp -r dist $out";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
       -
         meta = with pkgs.lib; {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
           description = "Yet another Discord mod";

     

       24
        
           homepage = "https://moonlight-mod.github.io/";

     

       25
        
           license = licenses.lgpl3;

     

       26
        
           maintainers = with maintainers; [ notnite ];

     

       27
        
         };

     

       28
       -
       }

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenv,

     

       4
       +
         nodejs_22,

     

       5
       +
         pnpm_10,

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       +
         pname = "moonlight";

     

       10
       +
         version = (builtins.fromJSON (builtins.readFile ./../package.json)).version;

     

       11
        
       

     

       0
        
       
     

       0
        
       
     

       12
        
         src = ./..;

     

       13
        
       

     

       14
       +
         nativeBuildInputs = [

     

       15
       +
           nodejs_22

     

       16
       +
           pnpm_10.configHook

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         ];

     

       18
       +
       

     

       19
       +
         pnpmDeps = pnpm_10.fetchDeps {

     

       20
       +
           inherit (finalAttrs) pname version src;

     

       21
       +
           hash = "sha256-JYHoTZuk0z1Tn39R5j0UJ41yZVNF0PpzrgkLzfCrxHI=";

     

       22
       +
         };

     

       23
        
       

     

       24
       +
         env = {

     

       25
       +
           NODE_ENV = "production";

     

       26
       +
           MOONLIGHT_VERSION = "v${finalAttrs.version}";

     

       27
       +
         };

     

       28
       +
       

     

       29
       +
         buildPhase = ''

     

       30
       +
           runHook preBuild

     

       31
        
       

     

       32
       +
           pnpm run build

     

       33
       +
       

     

       34
       +
           runHook postBuild

     

       35
       +
         '';

     

       36
       +
       

     

       37
       +
         installPhase = ''

     

       38
       +
           runHook preInstall

     

       39
       +
       

     

       40
       +
           cp -r dist $out

     

       41
       +
       

     

       42
       +
           runHook postInstall

     

       43
       +
         '';

     

       44
       +
       

     

       45
       +
         meta = with lib; {

     

       46
        
           description = "Yet another Discord mod";

     

       47
        
           homepage = "https://moonlight-mod.github.io/";

     

       48
        
           license = licenses.lgpl3;

     

       49
        
           maintainers = with maintainers; [ notnite ];

     

       50
        
         };

     

       51
       +
       })

+2 -5

nix/overlay.nix

···

       1
       -
       { pnpm2nix }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         nameTable = {

     
···

       49
        
             '';

     

       50
        
           });

     

       51
        
       in final: prev: rec {

     

       52
       -
         moonlight-mod = final.callPackage ./default.nix {

     

       53
       -
           pkgs = final;

     

       54
       -
           mkPnpmPackage = pnpm2nix.packages.${final.system}.mkPnpmPackage;

     

       55
       -
         };

     

       56
        
         discord = mkOverride prev moonlight-mod "discord";

     

       57
        
         discord-ptb = mkOverride prev moonlight-mod "discord-ptb";

     

       58
        
         discord-canary = mkOverride prev moonlight-mod "discord-canary";

···

       1
       +
       { ... }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         nameTable = {

     
···

       49
        
             '';

     

       50
        
           });

     

       51
        
       in final: prev: rec {

     

       52
       +
         moonlight-mod = final.callPackage ./default.nix { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
         discord = mkOverride prev moonlight-mod "discord";

     

       54
        
         discord-ptb = mkOverride prev moonlight-mod "discord-ptb";

     

       55
        
         discord-canary = mkOverride prev moonlight-mod "discord-canary";