commit 3455fa0f89db7916eb1fe7ddaa6d23b591a5af39 · wiro.world/dotfiles

+21 -7

templates/rust/flake.nix

···

       24
       24
        
             pkgs = import nixpkgs { inherit system overlays; };

     

       25
       25
        
             rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;

     

       26
       26
        
       

     

       27
       27
       -
             nativeBuildInputs = with pkgs; [ rustToolchain ];

     

       28
       28
       -
             buildInputs = with pkgs; [ ];

     

       27
       27
       +
             libraries = [ ];

     

       28
       28
       +
       

     

       29
       29
       +
             nativeBuildInputs = with pkgs; [

     

       30
       30
       +
               pkg-config

     

       31
       31
       +
               rustToolchain

     

       32
       32
       +
               rust-analyzer

     

       33
       33
       +
               act

     

       34
       34
       +
             ];

     

       35
       35
       +
             buildInputs = [ ];

     

       29
       36
        
           in

     

       30
       37
        
           {

     

       38
       38
       +
             formatter = pkgs.nixpkgs-fmt;

     

       39
       39
       +
       

     

       31
       40
        
             packages = rec {

     

       32
       32
       -
               default = my-app;

     

       33
       33
       -
               my-app = pkgs.callPackage ./package.nix { inherit gitignore; };

     

       41
       41
       +
               default = app;

     

       42
       42
       +
               app = pkgs.callPackage ./package.nix { inherit gitignore; };

     

       34
       43
        
             };

     

       35
       44
        
             apps = rec {

     

       36
       36
       -
               default = my-app;

     

       37
       37
       -
               my-app = flake-utils.lib.mkApp { drv = self.packages.${system}.my-app; };

     

       45
       45
       +
               default = app;

     

       46
       46
       +
               app = flake-utils.lib.mkApp { drv = self.packages.${system}.app; };

     

       38
       47
        
             };

     

       39
       48
        
       

     

       40
       40
       -
             devShells.default = pkgs.mkShellNoCC {

     

       49
       49
       +
             devShells.default = pkgs.mkShell {

     

       41
       50
        
               inherit nativeBuildInputs buildInputs;

     

       51
       51
       +
       

     

       52
       52
       +
               RUST_SRC_PATH = pkgs.rustPlatform.rustLibSrc;

     

       53
       53
       +
               LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libraries;

     

       54
       54
       +
       

     

       55
       55
       +
               RUST_LOG = "";

     

       42
       56
        
             };

     

       43
       57
        
           }

     

       44
       58
        
         );

+2 -2

templates/rust/package.nix

···

       1
       1
       -
       { lib, rustPlatform, gitignore, pkg-config, openssl }:

     

       1
       1
       +
       { lib, rustPlatform, gitignore }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         inherit (gitignore.lib) gitignoreSource;

     
···

       20
       20
        
         meta = {

     

       21
       21
        
           inherit (cargoTOML.package) description homepage license;

     

       22
       22
        
           maintainers = cargoTOML.package.authors;

     

       23
       23
       -
           mainProgram = "my-app";

     

       23
       23
       +
           mainProgram = "app";

     

       24
       24
        
         };

     

       25
       25
        
       }

+1

templates/rust/rustfmt.toml

···

       1
       1
       +
       hard_tabs = true