From 3dc8328b1f62dc8ecf3ea83de1cec91775112388 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 20 May 2018 14:45:50 -0500 Subject: [PATCH] sfml: support darwin --- pkgs/development/libraries/sfml/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index f52b7905c6ec..03a801a32405 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage +, IOKit, Foundation, AppKit, OpenAL }: let @@ -13,9 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"; }; buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew - libXrandr libXrender udev xcbutilimage - ]; - cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" ]; + libXrandr libXrender xcbutilimage + ] ++ stdenv.lib.optional stdenv.isLinux udev + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" + "-DSFML_MISC_INSTALL_PREFIX=share/SFML" + "-DSFML_BUILD_FRAMEWORKS=no" + "-DSFML_USE_SYSTEM_DEPS=yes" ]; meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; description = "Simple and fast multimedia library"; @@ -26,6 +31,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = [ maintainers.astsmtl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19e956e7a76..f2649357e1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11564,7 +11564,9 @@ with pkgs; simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; - sfml = callPackage ../development/libraries/sfml { }; + sfml = callPackage ../development/libraries/sfml { + inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + }; csfml = callPackage ../development/libraries/csfml { }; shapelib = callPackage ../development/libraries/shapelib { };