commit ae76e51f86a9f0d9c677e90e992126dda8276629 · pyrox.dev/nixpkgs

+9 -11

pkgs/games/freeorion/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         version = "0.4.7.1";

     

       7
       7
       +
         version = "0.4.8";

     

       8
       8
        
         name = "freeorion-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner  = "freeorion";

     

       12
       12
        
           repo   = "freeorion";

     

       13
       13
       -
           rev    = "v${version}";

     

       14
       14
       -
           sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp";

     

       13
       13
       +
           rev = "v${version}";

     

       14
       14
       +
           sha256 = "1lj1q2ljjgbbiqxb53wdrrcz0zxxr3vv9jqrhbzvfsss7q808jfw";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
       	(boost.override { enablePython = true; })

     

       19
       19
       +
           SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ];

     

       18
       20
        
       

     

       19
       21
        
         nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ];

     

       20
       22
        
       

     

       21
       23
        
         enableParallelBuilding = true;

     

       22
       24
        
       

     

       23
       25
        
         patches = [

     

       24
       24
       -
           # fix build with boost 1.66

     

       25
       25
       -
           (fetchpatch {

     

       26
       26
       -
             url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch;

     

       27
       27
       -
             sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94";

     

       28
       28
       -
           })

     

       29
       29
       -
           ./fix_rpaths.patch

     

       30
       26
        
         ];

     

       31
       27
        
       

     

       32
       28
        
         postInstall = ''

     
···

       41
       37
        
           chmod +x $out/fixpaths/fix-paths

     

       42
       38
        
       

     

       43
       39
        
           wrapProgram $out/bin/freeorion \

     

       44
       44
       -
             --run $out/fixpaths/fix-paths

     

       40
       40
       +
             --run $out/fixpaths/fix-paths \

     

       41
       41
       +
             --prefix LD_LIBRARY_PATH : $out/lib/freeorion

     

       45
       42
        
         '';

     

       46
       43
        
       

     

       47
       44
        
         meta = with stdenv.lib; {

     
···

       49
       46
        
           homepage = http://www.freeorion.org;

     

       50
       47
        
           license = with licenses; [ gpl2 cc-by-sa-30 ];

     

       51
       48
        
           platforms = platforms.linux;

     

       49
       49
       +
           maintainers = with maintainers; [ tex ];

     

       52
       50
        
         };

     

       53
       51
        
       }

+2 -2

pkgs/games/freeorion/fix-paths.sh

···

       1
       1
        
       #!/bin/sh

     

       2
       2
        
       

     

       3
       3
       -
       if [ -e ~/.freeorion/config.xml ]; then

     

       4
       4
       -
         @libxsltBin@/bin/xsltproc -o ~/.freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.freeorion/config.xml

     

       3
       3
       +
       if [ -e ~/.config/freeorion/config.xml ]; then

     

       4
       4
       +
         @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml

     

       5
       5
        
       fi

     

       6
       6
        
       exit 0

-11

pkgs/games/freeorion/fix_rpaths.patch

···

       1
       1
       -
       --- a/CMakeLists.txt

     

       2
       2
       -
       +++ b/CMakeLists.txt

     

       3
       3
       -
       @@ -46,7 +46,7 @@

     

       4
       4
       -
            set(FreeOrion_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/freeorion")

     

       5
       5
       -
        endif()

     

       6
       6
       -
        

     

       7
       7
       -
       -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${FreeOrion_INSTALL_LIBDIR}")

     

       8
       8
       -
       +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}/freeorion")

     

       9
       9
       -
        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

     

       10
       10
       -
        

     

       11
       11
       -
        if (WIN32)