pyrox.dev / nixpkgs
lol
fork atom

Re-Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)"

This reverts commit 9f4060c55289472edcd6a47b92cb3dc98380cbd8.
After the previous merge commit this should work now.

Vladimír Čunát 4ddea71b 063c5603

+6 -2
unified split
+5 -1
pkgs/development/interpreters/lua-5/default.nix
··· 1 1 # similar to interpreters/python/default.nix 2 - { stdenv, lib, callPackage, fetchurl, fetchpatch }: 2 + { stdenv, lib, callPackage, fetchurl, fetchpatch, makeBinaryWrapper }: 3 3 4 4 rec { 5 5 lua5_4 = callPackage ./interpreter.nix { 6 6 sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; 7 7 hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; 8 + makeWrapper = makeBinaryWrapper; 8 9 9 10 patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; 10 11 }; ··· 16 17 lua5_3 = callPackage ./interpreter.nix { 17 18 sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; 18 19 hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; 20 + makeWrapper = makeBinaryWrapper; 19 21 20 22 patches = 21 23 lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; ··· 29 31 lua5_2 = callPackage ./interpreter.nix { 30 32 sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; 31 33 hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; 34 + makeWrapper = makeBinaryWrapper; 32 35 patches = lib.optional stdenv.isDarwin ./5.2.darwin.patch; 33 36 }; 34 37 ··· 40 43 lua5_1 = callPackage ./interpreter.nix { 41 44 sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; 42 45 hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; 46 + makeWrapper = makeBinaryWrapper; 43 47 patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) 44 48 ++ [ ./CVE-2014-5461.patch ]; 45 49 };
+1
pkgs/development/interpreters/lua-5/interpreter.nix
··· 126 126 passthru = rec { 127 127 buildEnv = callPackage ./wrapper.nix { 128 128 lua = self; 129 + inherit makeWrapper; 129 130 inherit (luaPackages) requiredLuaModules; 130 131 }; 131 132 withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
-1
pkgs/tools/typesetting/sile/default.nix
··· 114 114 homepage = "https://sile-typesetter.org"; 115 115 changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md"; 116 116 platforms = platforms.unix; 117 - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 118 117 maintainers = with maintainers; [ doronbehar alerque ]; 119 118 license = licenses.mit; 120 119 };