From 68f7e7551744268438cc8bf5f721cb926e5dc883 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 13 Sep 2018 23:00:46 +0200 Subject: [PATCH 1/3] cernlib: mark broken on darwin Using gccStdenv makes the build go further, but then it fails with. kuipc /private/tmp/nix-build-cernlib-2006.drv-0/2006/src/packlib/kuip/code_kuip/kuipcdf.cdf kuipcdf.c Makefile:413: archive/kuipcdf.d: No such file or directory make[3]: *** [Makefile:473: kuipcdf.c] Abort trap: 6 /cc ZHF #45961 --- pkgs/development/libraries/physics/cernlib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index f837d807219..92d2ab96232 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cernlib.web.cern.ch; description = "Legacy collection of libraries and modules for data analysis in high energy physics"; + broken = stdenv.isDarwin; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; license = stdenv.lib.licenses.gpl2; From 54b4000d54433b9b49dab938f703994bb7707f3f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 13 Sep 2018 23:03:09 +0200 Subject: [PATCH 2/3] csfml: mark linux only While it's possible to build on darwin, we never had a successful build. Undefined symbols for architecture x86_64: "sf::microseconds(long long)", referenced from: _sfSleep in Sleep.cpp.o /cc ZHF #45961 --- pkgs/development/libraries/csfml/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 8f66b65e49a..6ec18b9514d 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { ''; license = licenses.zlib; maintainers = [ maintainers.jpdoyle ]; - - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } From 327edb4b1dc556b0342bde232c479cdcd0176997 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 13 Sep 2018 23:06:17 +0200 Subject: [PATCH 3/3] cargo-web: mark broken on darwin Looks CoreFoundation related. Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable", referenced from: fsevent_sys::core_foundation::str_path_to_cfstring_ref::h0ea4bd94e2c613f2 in libfsevent_sys-ef30b6879660a6c1.rlib(fsevent_sys-ef30b6879660a6c1.fsevent_sys7-49ce33334334dd3a5c7883bf4070f954.rs.rcgu.o) ld: symbol(s) not found for architecture x86_64 /cc ZHF #45961 --- pkgs/development/tools/cargo-web/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 06d6697ef96..e350e475f73 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }: +{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform +, CoreServices, Security +}: rustPlatform.buildRustPackage rec { name = "cargo-web-${version}"; @@ -14,12 +16,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si"; nativeBuildInputs = [ openssl pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; license = with licenses; [asl20 /* or */ mit]; maintainers = [ maintainers.kevincox ]; + broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e29c2db3577..48a7db7ebae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7181,7 +7181,9 @@ with pkgs; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; - cargo-web = callPackage ../development/tools/cargo-web { }; + cargo-web = callPackage ../development/tools/cargo-web { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };