Unverified Commit 8204ce98 authored by Yaya's avatar Yaya Committed by GitHub
Browse files

libresprite: fix build with cmake 4 (#451388)

parents fe460b77 a6c5e2fb

pkgs/by-name/li/libresprite/cmake4.diff

0 → 100644
+23 −0
Original line number Diff line number Diff line 
diff --git i/emscripten/CMakeLists.txt w/emscripten/CMakeLists.txt

index 7c6ea6a0e..b53a4b6cc 100644

--- i/emscripten/CMakeLists.txt

+++ w/emscripten/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 3.4.1)

+cmake_minimum_required(VERSION 3.10)

 project(LibreSprite C CXX)

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

 set(CMAKE_CXX_STANDARD 20)

diff --git i/third_party/observable/CMakeLists.txt w/third_party/observable/CMakeLists.txt

index 3ef458975..4d1f186dc 100644

--- i/third_party/observable/CMakeLists.txt

+++ w/third_party/observable/CMakeLists.txt

@@ -1,7 +1,7 @@

 # Observable Library

 # Copyright (C) 2016-2021 David Capello

 

-cmake_minimum_required(VERSION 3.2)

+cmake_minimum_required(VERSION 3.10)

 

 project(observable CXX)

 option(OBSERVABLE_TESTS "Compile observable tests" ON)

pkgs/by-name/li/libresprite/package.nix

+4 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
  pkg-config,

  ninja,

  gtest,



  curl,

  freetype,

  giflib,
@@ -38,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { 
    fetchSubmodules = true;

    hash = "sha256-jXjrA859hR46Cp5qi6Z1C+hLWCUR7yGlASOGlTveeW8=";

  };



  patches = [

    # From https://github.com/LibreSprite/LibreSprite/pull/565

    ./cmake4.diff

  ];

  nativeBuildInputs = [

    cmake

    pkg-config