commit c27de52d39b1963d0b13765db6a20d7c2f56e2d7 · pyrox.dev/nixpkgs

+17 -6

pkgs/applications/science/electronics/eagle/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig

     

       2
       2
        
       , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi

     

       3
       3
       +
       , libxcb, cups, xkeyboardconfig

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       let

     

       6
       7
        
       

     

       7
       8
        
         libPath = stdenv.lib.makeLibraryPath

     

       8
       9
        
           [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11

     

       9
       9
       -
             libXext libXi

     

       10
       10
       +
             libXext libXi libxcb cups

     

       10
       11
        
           ];

     

       11
       12
        
       

     

       12
       13
        
       in

     

       13
       14
        
       

     

       14
       15
        
       stdenv.mkDerivation rec {

     

       15
       16
        
         name = "eagle-${version}";

     

       16
       16
       -
         version = "6.6.0";

     

       17
       17
       +
         version = "7.5.0";

     

       17
       18
        
       

     

       18
       18
       -
         src = fetchurl {

     

       19
       19
       -
           url = "ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-${version}.run";

     

       20
       20
       -
           sha256 = "0m5289daah85b2rwpivnh2z1573v6j4alzjy9hg78fkb9jdgbn0x";

     

       21
       21
       -
         };

     

       19
       19
       +
         src =

     

       20
       20
       +
           if stdenv.system == "i686-linux" then

     

       21
       21
       +
             fetchurl {

     

       22
       22
       +
               url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run";

     

       23
       23
       +
               sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g";

     

       24
       24
       +
             }

     

       25
       25
       +
           else if stdenv.system == "x86_64-linux" then

     

       26
       26
       +
             fetchurl {

     

       27
       27
       +
               url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run";

     

       28
       28
       +
               sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9";

     

       29
       29
       +
             }

     

       30
       30
       +
           else

     

       31
       31
       +
             throw "Unsupported system: ${stdenv.system}";

     

       22
       32
        
       

     

       23
       33
        
         desktopItem = makeDesktopItem {

     

       24
       34
        
           name = "eagle";

     
···

       65
       75
        
           #!${stdenv.shell}

     

       66
       76
        
           export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}"

     

       67
       77
        
           export LD_PRELOAD="$out/lib/eagle_fixer.so"

     

       78
       78
       +
           export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"

     

       68
       79
        
           exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"

     

       69
       80
        
           EOF

     

       70
       81
        
           chmod a+x "$out"/bin/eagle

+1 -1

pkgs/top-level/all-packages.nix

···

       15001
       15001
        
       

     

       15002
       15002
        
         ### SCIENCE / ELECTRONICS

     

       15003
       15003
        
       

     

       15004
       15004
       -
         eagle = callPackage_i686 ../applications/science/electronics/eagle { };

     

       15004
       15004
       +
         eagle = callPackage ../applications/science/electronics/eagle { };

     

       15005
       15005
        
       

     

       15006
       15006
        
         caneda = callPackage ../applications/science/electronics/caneda { };

     

       15007
       15007