commit 1ab1c7166b79021b4e1928a11a10c53e68f461d4 · pyrox.dev/nixpkgs

+7 -4

pkgs/development/erlang-modules/build-rebar3.nix

···

       4
       4
        
       { name, version

     

       5
       5
        
       , src

     

       6
       6
        
       , setupHook ? null

     

       7
       7
       -
       , buildInputs ? [], erlangDeps ? [], pluginDeps ? []

     

       7
       7
       +
       , buildInputs ? [], erlangDeps ? [], buildPlugins ? []

     

       8
       8
        
       , postPatch ? ""

     

       9
       9
        
       , compilePorts ? false

     

       10
       10
        
       , installPhase ? null

     
···

       14
       14
        
       with stdenv.lib;

     

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
       -
         plugins = pluginDeps ++ (if compilePorts then [pc] else []);

     

       18
       18
       -
       

     

       17
       17
       +
         ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);

     

       19
       18
        
       

     

       20
       19
        
         shell = drv: stdenv.mkDerivation {

     

       21
       20
        
                 name = "interactive-shell-${drv.name}";

     
···

       28
       27
        
           inherit version;

     

       29
       28
        
       

     

       30
       29
        
           buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];

     

       31
       31
       -
           propagatedBuildInputs = erlangDeps ++ plugins;

     

       30
       30
       +
           propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);

     

       31
       31
       +
       

     

       32
       32
       +
           # The following are used by rebar3-nix-bootstrap

     

       33
       33
       +
           inherit compilePorts;

     

       34
       34
       +
           buildPlugins = ownPlugins;

     

       32
       35
        
       

     

       33
       36
        
           inherit src;

     

       34
       37

+1 -2

pkgs/development/tools/build-managers/rebar3/default.nix

···

       81
       81
        
         patches = [ ./hermetic-bootstrap.patch ];

     

       82
       82
        
       

     

       83
       83
        
         buildInputs = [ erlang tree  ];

     

       84
       84
       -
         propagatedBuildInputs = [ registrySnapshot  rebar3-nix-bootstrap ];

     

       85
       85
       -
       

     

       84
       84
       +
         propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];

     

       86
       85
        
       

     

       87
       86
        
         postPatch = ''

     

       88
       87
        
           echo postPatch