cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #110598 from turboMaCk/elm-json-darwin

Browse source 
elmPackages.elm-json: fix darwin build
This commit is contained in:
Domen Kožar 2021-01-23 18:52:29 +00:00 committed by GitHub
commit 5562fc646d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/elm/default.nix
View file

@ -2,7 +2,8 @@
, haskell, nodejs
, fetchurl, fetchpatch, makeWrapper, writeScriptBin
# Rust dependecies
, rustPlatform, openssl, pkg-config }:
, rustPlatform, openssl, pkg-config, Security
}:
let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
@ -96,7 +97,7 @@ let
elmRustPackages = {
elm-json = import ./packages/elm-json.nix {
inherit rustPlatform fetchurl openssl stdenv pkg-config;
inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security;
} // {
meta = with lib; {
description = "Install, upgrade and uninstall Elm dependencies";

4
pkgs/development/compilers/elm/packages/elm-json.nix
View file

@ -1,4 +1,4 @@
{ rustPlatform, fetchurl, openssl, stdenv, pkg-config }:
{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }:
rustPlatform.buildRustPackage rec {
pname = "elm-json";
version = "0.2.7";
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7";

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

@ -9527,7 +9527,9 @@ in
elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix;
elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm {
inherit (darwin.apple_sdk.frameworks) Security;
});
apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };