diff options
author | pacien <pacien.trangirard@pacien.net> | 2021-05-16 13:16:17 +0200 |
---|---|---|
committer | pacien <pacien.trangirard@pacien.net> | 2021-05-22 15:27:17 +0200 |
commit | eb01e5193860a51e5d581345a993a4214e842690 (patch) | |
tree | d90ce24dee675935642644413af244c8784f8c62 | |
parent | 7a1fbc38a4b538450ac0d42aec8a3e513b4d723e (diff) |
ldgallery: fix darwin build
This adds a missing build dependency for building on Darwin. GitHub: fixes #122681
-rw-r--r-- | pkgs/tools/graphics/ldgallery/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/ldgallery/viewer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/ldgallery/default.nix b/pkgs/tools/graphics/ldgallery/default.nix index 6291dc9d64230..84d179374ae82 100644 --- a/pkgs/tools/graphics/ldgallery/default.nix +++ b/pkgs/tools/graphics/ldgallery/default.nix @@ -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 diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix index 9559120069f79..f4cebde86070b 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada07a7430419..41993bd73ffc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6032,7 +6032,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 { }; |