commit 91c80faea0dcbc3d8199f57d4794c645a3a4a66f · pyrox.dev/nixpkgs

+41

pkgs/development/lua-modules/nfd/default.nix

···

       1
       1
       +
       { fetchFromGitHub, buildLuarocksPackage, lua, maintainers, pkg-config

     

       2
       2
       +
       , substituteAll, zenity }:

     

       3
       3
       +
       

     

       4
       4
       +
       buildLuarocksPackage {

     

       5
       5
       +
         pname = "nfd";

     

       6
       6
       +
         version = "scm-1";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "Vexatos";

     

       10
       10
       +
           repo = "nativefiledialog";

     

       11
       11
       +
           rev = "2f74a5758e8df9b27158d444953697bc13fe90d8";

     

       12
       12
       +
           sha256 = "1f52mb0s9zrpsqjp10bx92wzqmy1lq7fg1fk1nd6xmv57kc3b1qv";

     

       13
       13
       +
           fetchSubmodules = true;

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # use zenity because default gtk impl just crashes

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           (substituteAll {

     

       19
       19
       +
             src = ./zenity.patch;

     

       20
       20
       +
             inherit zenity;

     

       21
       21
       +
           })

     

       22
       22
       +
         ];

     

       23
       23
       +
         rockspecDir = "lua";

     

       24
       24
       +
       

     

       25
       25
       +
         extraVariables.LUA_LIBDIR = "${lua}/lib";

     

       26
       26
       +
         nativeBuildInputs = [ pkg-config ];

     

       27
       27
       +
       

     

       28
       28
       +
         fixupPhase = ''

     

       29
       29
       +
           find $out -name nfd_zenity.so -execdir mv {} nfd.so \;

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         disabled = with lua; (luaversion != "5.1");

     

       33
       33
       +
       

     

       34
       34
       +
         meta = {

     

       35
       35
       +
           description =

     

       36
       36
       +
             "A tiny, neat lua library that portably invokes native file open and save dialogs.";

     

       37
       37
       +
           homepage = "https://github.com/Alloyed/nativefiledialog/tree/master/lua";

     

       38
       38
       +
           license.fullName = "zlib";

     

       39
       39
       +
           maintainers = [ maintainers.scoder12 ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+47

pkgs/development/lua-modules/nfd/zenity.patch

···

       1
       1
       +
       diff --git a/lua/Makefile.linux b/lua/Makefile.linux

     

       2
       2
       +
       index 9f5aa68..77660d4 100644

     

       3
       3
       +
       --- a/lua/Makefile.linux

     

       4
       4
       +
       +++ b/lua/Makefile.linux

     

       5
       5
       +
       @@ -37,5 +37,5 @@ nfd_zenity.o: src/nfd_zenity.c

     

       6
       6
       +
        clean: 

     

       7
       7
       +
        	rm nfd_common.o nfd_gtk.o nfd_wrap_lua.o nfd.so

     

       8
       8
       +
        

     

       9
       9
       +
       -install: nfd.so

     

       10
       10
       +
       -	cp nfd.so $(INST_LIBDIR)

     

       11
       11
       +
       +install:

     

       12
       12
       +
       +	cp nfd*.so $(INST_LIBDIR)

     

       13
       13
       +
       diff --git a/lua/nfd-scm-1.rockspec b/lua/nfd-scm-1.rockspec

     

       14
       14
       +
       index 503399d..2d0a7da 100644

     

       15
       15
       +
       --- a/lua/nfd-scm-1.rockspec

     

       16
       16
       +
       +++ b/lua/nfd-scm-1.rockspec

     

       17
       17
       +
       @@ -17,9 +17,6 @@ supported_platforms = { "linux", "macosx", "windows" }

     

       18
       18
       +
        external_dependencies = {

     

       19
       19
       +
           platforms = {

     

       20
       20
       +
              linux = {

     

       21
       21
       +
       -         gtk3 = {

     

       22
       22
       +
       -            library = "gtk-3",

     

       23
       23
       +
       -         }

     

       24
       24
       +
              }

     

       25
       25
       +
           }

     

       26
       26
       +
        }

     

       27
       27
       +
       @@ -28,6 +25,7 @@ build = {

     

       28
       28
       +
              linux = {

     

       29
       29
       +
                 type = "make",

     

       30
       30
       +
                 makefile = "lua/Makefile.linux",

     

       31
       31
       +
       +         build_target = "nfd_zenity.so",

     

       32
       32
       +
                 build_variables = {

     

       33
       33
       +
                    CFLAGS="$(CFLAGS)",

     

       34
       34
       +
                    LIBFLAG="$(LIBFLAG)",

     

       35
       35
       +
       diff --git a/src/nfd_zenity.c b/src/nfd_zenity.c

     

       36
       36
       +
       index 43ccc6d..3fcdea0 100644

     

       37
       37
       +
       --- a/src/nfd_zenity.c

     

       38
       38
       +
       +++ b/src/nfd_zenity.c

     

       39
       39
       +
       @@ -109,6 +109,8 @@ ZenityCommon(char**      command,

     

       40
       40
       +
                command[i] = tmp;

     

       41
       41
       +
            }

     

       42
       42
       +
        

     

       43
       43
       +
       +    // caller always sets command[0] to "zenity"

     

       44
       44
       +
       +    command[0] = strdup("@zenity@/bin/zenity");

     

       45
       45
       +
            AddFiltersToCommandArgs(command, commandLen, filterList);

     

       46
       46
       +
        

     

       47
       47
       +
            int byteCount = 0;

pkgs/top-level/lua-packages.nix

···

       104
       104
        
           };

     

       105
       105
        
         };

     

       106
       106
        
       

     

       107
       107
       +
         nfd = callPackage ../development/lua-modules/nfd {

     

       108
       108
       +
           inherit (lib) maintainers;

     

       109
       109
       +
           inherit (pkgs.gnome) zenity;

     

       110
       110
       +
         };

     

       111
       111
       +
       

     

       107
       112
        
         vicious = luaLib.toLuaModule( stdenv.mkDerivation rec {

     

       108
       113
        
           pname = "vicious";

     

       109
       114
        
           version = "2.5.1";