Commit e4e0b934 authored by Weijia Wang's avatar Weijia Wang
Browse files

pslib: fix build

parent 4d5fc6eb
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58a5b45..b41e6a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.10)
+
 PROJECT(pslib C)
 option(ENABLE_BMP   "Build with BMP support" ON)

@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists)
 INCLUDE(TestBigEndian)
 test_big_endian(WORDS_BIGENDIAN)

-SUBDIRS( src )
 SET(SOURCES
        src/pslib.c
        src/ps_memory.c
 No newline at end of file
+4 −4
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64=";
  };

  patches = [
    ./cmake4.patch
  ];

  nativeBuildInputs = [
    cmake
    pkg-config
@@ -33,10 +37,6 @@ stdenv.mkDerivation rec {
    libtiff
  ];

  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
  };

  doCheck = true;

  outputs = [