commit 3e23865bbef2bc965ad70d0cc1d06663948ae98c · pyrox.dev/nixpkgs

+5 -3

pkgs/development/interpreters/erlang/R17.nix

···

       1
       1
        
       { stdenv, fetchurl, perl, gnum4, ncurses, openssl

     

       2
       2
        
       , gnused, gawk, makeWrapper

     

       3
       3
       +
       , Carbon, Cocoa

     

       3
       4
        
       , odbcSupport ? false, unixODBC ? null

     

       4
       5
        
       , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null

     

       5
       6
        
       , javacSupport ? false, openjdk ? null

     
···

       27
       28
        
       

     

       28
       29
        
         buildInputs =

     

       29
       30
        
           [ perl gnum4 ncurses openssl makeWrapper

     

       30
       30
       -
           ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])

     

       31
       31
       -
             ++ optional odbcSupport [ unixODBC ]

     

       32
       32
       -
             ++ optional javacSupport [ openjdk ];

     

       31
       31
       +
           ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])

     

       32
       32
       +
             ++ optional odbcSupport unixODBC

     

       33
       33
       +
             ++ optional javacSupport openjdk

     

       34
       34
       +
             ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];

     

       33
       35
        
       

     

       34
       36
        
         patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

     

       35
       37

+15 -4

pkgs/top-level/all-packages.nix

···

       5233
       5233
        
       

     

       5234
       5234
        
         erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };

     

       5235
       5235
        
         erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };

     

       5236
       5236
       -
         erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };

     

       5237
       5237
       -
         erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };

     

       5238
       5238
       -
         erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };

     

       5239
       5239
       -
         erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };

     

       5236
       5236
       +
         erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {

     

       5237
       5237
       +
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       5238
       5238
       +
         };

     

       5239
       5239
       +
         erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {

     

       5240
       5240
       +
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       5241
       5241
       +
           odbcSupport = true;

     

       5242
       5242
       +
         };

     

       5243
       5243
       +
         erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {

     

       5244
       5244
       +
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       5245
       5245
       +
           javacSupport = true;

     

       5246
       5246
       +
         };

     

       5247
       5247
       +
         erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {

     

       5248
       5248
       +
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       5249
       5249
       +
           javacSupport = true; odbcSupport = true;

     

       5250
       5250
       +
         };

     

       5240
       5251
        
         erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {

     

       5241
       5252
        
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       5242
       5253
        
         };