Merge pull request #123226 from pacien/ldgallery-fix-darwin-build
This commit is contained in:
commit
55aa5e870c
|
@ -1,10 +1,10 @@
|
|||
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:
|
||||
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }:
|
||||
|
||||
with lib;
|
||||
with haskell.lib;
|
||||
|
||||
let
|
||||
ldgallery-viewer = pkgs.callPackage ./viewer { };
|
||||
ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; };
|
||||
inherit (haskellPackages) ldgallery-compiler;
|
||||
|
||||
in
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
@ -24,6 +24,7 @@ let
|
|||
nodePkg = nodePackages.package.override {
|
||||
src = "${sourcePkg}/viewer";
|
||||
postInstall = "npm run build";
|
||||
buildInputs = optionals stdenv.isDarwin [ CoreServices ];
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
@ -6057,7 +6057,9 @@ in
|
|||
|
||||
ldc = callPackage ../development/compilers/ldc { };
|
||||
|
||||
ldgallery = callPackage ../tools/graphics/ldgallery { };
|
||||
ldgallery = callPackage ../tools/graphics/ldgallery {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
lbreakout2 = callPackage ../games/lbreakout2 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue