commit a15e4b69e7ed874f7def752b7deeb4c6551d361b · pyrox.dev/nixpkgs

+13 -1

pkgs/development/r-modules/default.nix

···

       280
        
           mwaved = [ pkgs.fftw.dev ];

     

       281
        
           ncdf4 = [ pkgs.netcdf ];

     

       282
        
           nloptr = [ pkgs.nlopt pkgs.pkgconfig ];

     

       0
        
       
     

       283
        
           odbc = [ pkgs.unixODBC ];

     

       284
        
           pander = [ pkgs.pandoc pkgs.which ];

     

       285
        
           pbdMPI = [ pkgs.openmpi ];

     
···

       415
        
           systemfonts = [ pkgs.pkgconfig ];

     

       416
        
           tesseract = [ pkgs.pkgconfig ];

     

       417
        
           Cairo = [ pkgs.pkgconfig ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       418
        
           Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];

     

       419
        
           tcltk2 = [ pkgs.tcl pkgs.tk ];

     

       420
        
           tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];

     
···

       802
        
           openssl = old.openssl.overrideDerivation (attrs: {

     

       803
        
             preConfigure = ''

     

       804
        
               patchShebangs configure

     

       805
       -
               '';

     

       806
        
             PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";

     

       807
        
             PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";

     

       808
        
           });

     
···

       852
        
           });

     

       853
        
       

     

       854
        
           magick = old.magick.overrideDerivation (attrs: {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       855
        
             preConfigure = ''

     

       856
        
               patchShebangs configure

     

       857
        
               '';

···

       280
        
           mwaved = [ pkgs.fftw.dev ];

     

       281
        
           ncdf4 = [ pkgs.netcdf ];

     

       282
        
           nloptr = [ pkgs.nlopt pkgs.pkgconfig ];

     

       283
       +
           n1qn1 = [ pkgs.gfortran ];

     

       284
        
           odbc = [ pkgs.unixODBC ];

     

       285
        
           pander = [ pkgs.pandoc pkgs.which ];

     

       286
        
           pbdMPI = [ pkgs.openmpi ];

     
···

       416
        
           systemfonts = [ pkgs.pkgconfig ];

     

       417
        
           tesseract = [ pkgs.pkgconfig ];

     

       418
        
           Cairo = [ pkgs.pkgconfig ];

     

       419
       +
           CLVTools = [ pkgs.gsl ];

     

       420
       +
           JMcmprsk = [ pkgs.gsl ];

     

       421
       +
           mashr = [ pkgs.gsl ];

     

       422
       +
           hadron = [ pkgs.gsl ];

     

       423
       +
           AMOUNTAIN = [ pkgs.gsl ];

     

       424
        
           Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];

     

       425
        
           tcltk2 = [ pkgs.tcl pkgs.tk ];

     

       426
        
           tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];

     
···

       808
        
           openssl = old.openssl.overrideDerivation (attrs: {

     

       809
        
             preConfigure = ''

     

       810
        
               patchShebangs configure

     

       811
       +
             '';

     

       812
        
             PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";

     

       813
        
             PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";

     

       814
        
           });

     
···

       858
        
           });

     

       859
        
       

     

       860
        
           magick = old.magick.overrideDerivation (attrs: {

     

       861
       +
             preConfigure = ''

     

       862
       +
               patchShebangs configure

     

       863
       +
               '';

     

       864
       +
           });

     

       865
       +
       

     

       866
       +
           libgeos = old.libgeos.overrideDerivation (attrs: {

     

       867
        
             preConfigure = ''

     

       868
        
               patchShebangs configure

     

       869
        
               '';

-13

pkgs/development/r-modules/patches/qtbase.patch

···

       1
       -
       diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile

     

       2
       -
       --- qtbase_orig/src/Makefile	2012-03-03 03:57:47.000000000 +0900

     

       3
       -
       +++ qtbase/src/Makefile	2014-11-01 23:06:51.383876323 +0900

     

       4
       -
       @@ -10,6 +10,9 @@

     

       5
       -
        	      -DR_INCLUDES=${R_INCLUDE_DIR} \

     

       6
       -
        	      -DCMAKE_INSTALL_PREFIX=../src; \

     

       7
       -
        	make install

     

       8
       -
       +# I could not control RPATH via CMake. HELP WANTED!

     

       9
       -
       +	patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so

     

       10
       -
       +	find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} 

     

       11
       -
        

     

       12
       -
        clean:

     

       13
       -
        	rm -rf ../kdebindings-build