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

Fix elm-json build on Darwin

Browse Source
This commit is contained in:
Marek Fajkus 2021-01-23 14:28:08 +01:00
parent bba33c36fa
commit 07a6732bf5
No known key found for this signature in database
GPG Key ID: 95585219BA6FE2CC
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 , haskell, nodejs
, fetchurl, fetchpatch, makeWrapper, writeScriptBin , fetchurl, fetchpatch, makeWrapper, writeScriptBin
# Rust dependecies # Rust dependecies
, rustPlatform, openssl, pkg-config }: , rustPlatform, openssl, pkg-config, Security
}:
let let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
@ -96,7 +97,7 @@ let
elmRustPackages = { elmRustPackages = {
elm-json = import ./packages/elm-json.nix { 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; { meta = with lib; {
description = "Install, upgrade and uninstall Elm dependencies"; 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 { rustPlatform.buildRustPackage rec {
pname = "elm-json"; pname = "elm-json";
version = "0.2.7"; version = "0.2.7";
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7";

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

@ -9523,7 +9523,9 @@ in
elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix; 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 { }; apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };