public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123226 from pacien/ldgallery-fix-darwin-build

Browse Source
This commit is contained in:
Sandro
2021-05-22 15:51:52 +02:00
committed by GitHub
parent f29969988d eb01e51938
commit 55aa5e870c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/ldgallery/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }: { lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }:
with lib; with lib;
with haskell.lib; with haskell.lib;
let let
ldgallery-viewer = pkgs.callPackage ./viewer { }; ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; };
inherit (haskellPackages) ldgallery-compiler; inherit (haskellPackages) ldgallery-compiler;
in in
pkgs/tools/graphics/ldgallery/viewer/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }: { lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:
with lib; with lib;
@@ -24,6 +24,7 @@ let
nodePkg = nodePackages.package.override { nodePkg = nodePackages.package.override {
src = "${sourcePkg}/viewer"; src = "${sourcePkg}/viewer";
postInstall = "npm run build"; postInstall = "npm run build";
buildInputs = optionals stdenv.isDarwin [ CoreServices ];
}; };
in in
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -6057,7 +6057,9 @@ in
ldc = callPackage ../development/compilers/ldc { }; 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 { }; lbreakout2 = callPackage ../games/lbreakout2 { };