Commit 884047a2 authored by Xiangyan Sun's avatar Xiangyan Sun
Browse files

globulation2: fix build with boost 1.89

parent d5dcf11d

pkgs/by-name/gl/globulation2/package.nix

+5 −10
Original line number Diff line number Diff line
@@ -43,19 +43,15 @@ stdenv.mkDerivation rec { 
      sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";

    })

    (fetchpatch {

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch";

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-11/debian/patches/10_pthread_underlinkage.patch";

      sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0=";

    })

    (fetchpatch {

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch";

      sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4=";

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-11/debian/patches/scons.patch";

      sha256 = "sha256-kHuFQCmkCkogqK6vfHKGYeZrMvsdQ7h8B3CcCtjLr50=";

    })

    (fetchpatch {

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch";

      sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU=";

    })

    (fetchpatch {

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch";

      url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-11/debian/patches/boost-1.69.patch";

      sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI=";

    })

  ];
@@ -77,6 +73,7 @@ stdenv.mkDerivation rec { 
    scons

    bsdiff # bspatch

  ];



  buildInputs = [

    libGLU

    libGL
@@ -98,8 +95,6 @@ stdenv.mkDerivation rec { 
    "DATADIR=${placeholder "out"}/share/globulation2/glob2"

  ];



  env.NIX_LDFLAGS = "-lboost_system";



  meta = {

    description = "RTS without micromanagement";

    mainProgram = "glob2";