Skip to content

Fix sile wrapper issues on darwin. #172407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zaphar wants to merge 1 commit into from
Closed

Fix sile wrapper issues on darwin. #172407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/lua-5/interpreter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, readline
, compat ? false
, callPackage
, makeWrapper
, makeBinaryWrapper
, packageOverrides ? (final: prev: {})
, sourceVersion
, hash
Expand Down Expand Up @@ -40,7 +40,7 @@ self = stdenv.mkDerivation rec {
LuaCPathSearchPaths = luaPackages.lib.luaCPathList;
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;

nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeBinaryWrapper ];
buildInputs = [ readline ];

inherit patches;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/lua-5/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, lua, buildEnv, makeWrapper
{ lib, stdenv, lua, buildEnv, makeBinaryWrapper
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
Expand All @@ -19,7 +19,7 @@ let
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;

nativeBuildInputs = [
makeWrapper
makeBinaryWrapper
(lua.pkgs.lua-setup-hook lua.LuaPathSearchPaths lua.LuaCPathSearchPaths)
];

Expand Down
1 change: 0 additions & 1 deletion pkgs/tools/typesetting/sile/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ stdenv.mkDerivation rec {
homepage = "https://sile-typesetter.org";
changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md";
platforms = platforms.unix;
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018
maintainers = with maintainers; [ doronbehar alerque ];
license = licenses.mit;
};
Expand Down