Unverified Commit daf84d2d authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

sfml: 2.5.1 -> 3.0.0 (#387764)

parents b20adf12 8369a4dd

pkgs/by-name/an/antsimulator/package.nix

+16 −12
Original line number Diff line number Diff line
@@ -3,45 +3,49 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  sfml,

  sfml_2,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "antsimulator";

  version = "3.1";



  src = fetchFromGitHub {

    owner = "johnBuffer";

    repo = "AntSimulator";

    rev = "v${version}";

    sha256 = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";

  };



  nativeBuildInputs = [ cmake ];

  buildInputs = [ sfml ];

  buildInputs = [ sfml_2 ];



  postPatch = ''

    substituteInPlace src/main.cpp \

      --replace "res/" "$out/opt/antsimulator/"

      --replace-fail "res/" "$out/opt/antsimulator/"



    substituteInPlace include/simulation/config.hpp \

      --replace "res/" "$out/opt/antsimulator/"

      --replace-fail "res/" "$out/opt/antsimulator/"



    substituteInPlace include/render/colony_renderer.hpp \

      --replace "res/" "$out/opt/antsimulator/"

      --replace-fail "res/" "$out/opt/antsimulator/"

  '';



  installPhase = ''

    runHook preInstall



    install -Dm644 -t $out/opt/antsimulator res/*

    install -Dm755 ./AntSimulator $out/bin/antsimulator



    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    homepage = "https://github.com/johnBuffer/AntSimulator";

    description = "Simple Ants simulator";

    mainProgram = "antsimulator";

    license = licenses.mit;

    license = lib.licenses.mit;

    maintainers = [ ];

    platforms = platforms.unix;

    platforms = lib.platforms.unix;

  };

}
 
})

pkgs/by-name/at/attract-mode/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  libarchive,

  libjpeg,

  libGLU,

  sfml,

  sfml_2,

  zlib,

  openal,

  fontconfig,
@@ -36,7 +36,7 @@ stdenv.mkDerivation { 
      libarchive

      libjpeg

      libGLU

      sfml

      sfml_2

      zlib

    ]

    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

pkgs/by-name/cs/csfml/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  sfml,

  sfml_2,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  nativeBuildInputs = [ cmake ];

  buildInputs = [ sfml ];

  buildInputs = [ sfml_2 ];

  cmakeFlags = [

    (lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml}/share/SFML/cmake/Modules/")

    (lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml_2}/share/SFML/cmake/Modules/")

  ];



  meta = {

pkgs/by-name/cu/cutecapture/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

  autoreconfHook,

  libusb1,

  sfml,

  sfml_2,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "Gotos";

    repo = "cutecapture";

    rev = "v${finalAttrs.version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-V8BlZykh9zOTcEypu96Ft9/6CtjsybtD8lBsg9sF5sQ=";

  };
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    libusb1

    sfml

    sfml_2

  ];



  postPatch = ''
@@ -40,11 +40,11 @@ stdenv.mkDerivation (finalAttrs: { 
    install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png

  '';



  meta = with lib; {

  meta = {

    description = "(3)DS capture software for Linux and Mac";

    homepage = "https://github.com/Gotos/CuteCapture";

    license = licenses.asl20;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ raphaelr ];

    license = lib.licenses.asl20;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

    maintainers = with lib.maintainers; [ raphaelr ];

  };

})

pkgs/by-name/do/dolphin-emu/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: { 
    branch = "master";

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.unix;

    badPlatforms = [

      # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'

      lib.systems.inspect.patterns.isDarwin

    ];

    maintainers = with lib.maintainers; [ pbsds ];

  };

})