pyrox.dev / nixpkgs
lol
fork atom

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

This reverts commit 92f4c6ed823ce10c484daa6582a908c5ae9ad61b.
On aarch64-darwin this completely broke lua instead of improving it;
let's revert at least until that's resolved.
https://github.com/NixOS/nixpkgs/pull/172749#issuecomment-1133759233

Vladimír Čunát 9f4060c5 a7d4e415

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