From 3daf90e63e980799a60a29c44e123e74f286aa77 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Sat, 22 Dec 2018 22:22:55 +0100 Subject: [PATCH 1/3] sfml: fix build on Darwin --- pkgs/development/libraries/sfml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 37ef0ce7527..29ca0f171eb 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage -, IOKit, Foundation, AppKit, OpenAL +, darwin, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender xcbutilimage ] ++ stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" From c9677e38be7ec1649324eb66560f3616ea36db0b Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Sat, 22 Dec 2018 23:51:50 +0100 Subject: [PATCH 2/3] sfml: relax Darwin dependencies --- pkgs/development/libraries/sfml/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 29ca0f171eb..435a9e030a0 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew - libXrandr libXrender xcbutilimage - ] ++ stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; + buildInputs = [ freetype libjpeg openal flac libvorbis glew ] + ++ stdenv.lib.optional stdenv.isLinux udev + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" From 0bb53c3e8a8ed9464e910c381b8e9d74fb415644 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 3 Jan 2019 16:13:12 +0100 Subject: [PATCH 3/3] sfml: comment the cf-private workaround --- pkgs/development/libraries/sfml/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 435a9e030a0..ff59bdcdf92 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage -, darwin, IOKit, Foundation, AppKit, OpenAL +, cf-private, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libjpeg openal flac libvorbis glew ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL + # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate + cf-private + ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f8cb564bd..8ba09747813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12491,6 +12491,7 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { };