alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/graphics/ldgallery/default.nix
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

3
pkgs/tools/graphics/ldgallery/viewer/default.nix
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

4
pkgs/top-level/all-packages.nix
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 { };