dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #46628 from LnL7/darwin-broken-c

Browse Source 
broken darwin packages (c)
This commit is contained in:
xeji 2018-09-14 10:43:40 +02:00 committed by GitHub
commit 3531c276d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/csfml/default.nix
View File

@ -25,7 +25,6 @@ stdenv.mkDerivation {
'';
license = licenses.zlib;
maintainers = [ maintainers.jpdoyle ];
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
};
}

1
pkgs/development/libraries/physics/cernlib/default.nix
View File

@ -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;

6
pkgs/development/tools/cargo-web/default.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };