diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 16e29d6cffcf..0336fdce6c64 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -15,8 +15,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "Vexatos"; repo = "nativefiledialog"; - rev = "2f74a5758e8df9b27158d444953697bc13fe90d8"; - sha256 = "1f52mb0s9zrpsqjp10bx92wzqmy1lq7fg1fk1nd6xmv57kc3b1qv"; + rev = "bea4560b9269bdc142fef946ccd8682450748958"; + hash = "sha256-veCLHTmZU4puZW0NHeWFZa80XKc6w6gxVLjyBmTrejg="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ buildLuarocksPackage { ''; doInstallCheck = true; - installCheckInputs = [ lua.pkgs.busted ]; + nativeInstallCheckInputs = [ lua.pkgs.busted ]; installCheckPhase = '' busted lua/spec/ ''; diff --git a/pkgs/development/lua-modules/nfd/zenity.patch b/pkgs/development/lua-modules/nfd/zenity.patch index 59a91e0e546c..5a16ad62a918 100644 --- a/pkgs/development/lua-modules/nfd/zenity.patch +++ b/pkgs/development/lua-modules/nfd/zenity.patch @@ -1,13 +1,13 @@ diff --git a/lua/Makefile.linux b/lua/Makefile.linux -index 9f5aa68..77660d4 100644 +index 7afda4c..87b4a11 100644 --- a/lua/Makefile.linux +++ b/lua/Makefile.linux -@@ -37,5 +37,5 @@ nfd_zenity.o: src/nfd_zenity.c +@@ -37,5 +37,5 @@ clean: clean: rm nfd_common.o nfd_gtk.o nfd_wrap_lua.o nfd.so --install: nfd.so -- cp nfd.so $(INST_LIBDIR) +-install: nfd.so nfd_zenity.so +- cp nfd.so nfd_zenity.so $(INST_LIBDIR) +install: + cp nfd*.so $(INST_LIBDIR) diff --git a/lua/nfd-scm-1.rockspec b/lua/nfd-scm-1.rockspec diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index bdbe2f6a4545..5b455679b365 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -842,10 +842,6 @@ in ''; }); - nfd = prev.nfd.overrideAttrs { - strictDeps = false; - }; - nlua = prev.nlua.overrideAttrs { # patchShebang removes the nvim in nlua's shebang so we hardcode one