commit 3848bec25c7384848c7f375f19ff4bc25fb03a01 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #232463 from figsoda/joplin

joplin: fix build on darwin

Weijia Wang 2 years ago 3848bec2 fbe5db61

options

unified split

Changed files

+5 -1

pkgs

development

node-packages

overrides.nix

+5 -1

pkgs/development/node-packages/overrides.nix

···

       229
       229
        
         });

     

       230
       230
        
       

     

       231
       231
        
         joplin = prev.joplin.override {

     

       232
       232
       -
           nativeBuildInputs = [ pkgs.pkg-config ];

     

       232
       232
       +
           nativeBuildInputs = [

     

       233
       233
       +
             pkgs.pkg-config

     

       234
       234
       +
           ] ++ lib.optionals stdenv.isDarwin [

     

       235
       235
       +
             pkgs.xcbuild

     

       236
       236
       +
           ];

     

       233
       237
        
           buildInputs = with pkgs; [

     

       234
       238
        
             # required by sharp

     

       235
       239
        
             # https://sharp.pixelplumbing.com/install