commit c6e5939c8fa2ab2230baf1378a34746e8db1aed7 · pyrox.dev/nixpkgs

+4 -4

pkgs/development/libraries/liblxi/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
       -
       , pkg-config, autoreconfHook

     

       2
       2
       +
       , meson, ninja, pkg-config, cmake

     

       3
       3
        
       , libtirpc, rpcsvc-proto, avahi, libxml2

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "liblxi";

     

       8
       8
       -
         version = "1.13";

     

       8
       8
       +
         version = "1.18";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "lxi-tools";

     

       12
       12
        
           repo = "liblxi";

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6";

     

       14
       14
       +
           sha256 = "sha256-2tZWIN58J6zNHG3dahNfg5eNiS8ykWFQyRSyikuzdjE=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ];

     

       17
       17
       +
         nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ libtirpc avahi libxml2 ];

     

       20
       20

+26 -6

pkgs/tools/networking/lxi-tools/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
       -
       , autoreconfHook, pkg-config

     

       3
       3
       -
       , liblxi, readline, lua

     

       2
       2
       +
       , meson, ninja, cmake, pkg-config

     

       3
       3
       +
       , liblxi, readline, lua, bash-completion

     

       4
       4
       +
       , wrapGAppsHook

     

       5
       5
       +
       , glib, gtk4, gtksourceview5, libadwaita, json-glib

     

       6
       6
       +
       , desktop-file-utils, appstream-glib

     

       7
       7
       +
       , gsettings-desktop-schemas

     

       8
       8
       +
       , withGui ? false

     

       4
       9
        
       }:

     

       5
       10
        
       

     

       6
       11
        
       stdenv.mkDerivation rec {

     

       7
       12
        
         pname = "lxi-tools";

     

       8
       8
       -
         version = "1.21";

     

       13
       13
       +
         version = "2.3";

     

       9
       14
        
       

     

       10
       15
        
         src = fetchFromGitHub {

     

       11
       16
        
           owner = "lxi-tools";

     

       12
       17
        
           repo = "lxi-tools";

     

       13
       18
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc";

     

       19
       19
       +
           sha256 = "sha256-c53Jn/9xKsxQDsRWU2LKtNWs28AuG4t5OwYOAMxpcPA=";

     

       15
       20
        
         };

     

       16
       21
        
       

     

       17
       17
       -
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           meson ninja cmake pkg-config

     

       24
       24
       +
         ] ++ lib.optional withGui wrapGAppsHook;

     

       18
       25
        
       

     

       19
       19
       -
         buildInputs = [ liblxi readline lua ];

     

       26
       26
       +
         buildInputs = [

     

       27
       27
       +
           liblxi readline lua bash-completion

     

       28
       28
       +
         ] ++ lib.optionals withGui [

     

       29
       29
       +
           glib gtk4 gtksourceview5 libadwaita json-glib

     

       30
       30
       +
           desktop-file-utils appstream-glib

     

       31
       31
       +
           gsettings-desktop-schemas

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         postUnpack = "sed -i '/meson.add_install.*$/d' source/meson.build";

     

       35
       35
       +
       

     

       36
       36
       +
         mesonFlags = lib.optional (!withGui) "-Dgui=false";

     

       37
       37
       +
       

     

       38
       38
       +
         postInstall = lib.optionalString withGui

     

       39
       39
       +
           "glib-compile-schemas $out/share/glib-2.0/schemas";

     

       20
       40
        
       

     

       21
       41
        
         meta = with lib; {

     

       22
       42
        
           description = "Tool for communicating with LXI compatible instruments";

pkgs/top-level/all-packages.nix

···

       30213
       30213
        
         lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { };

     

       30214
       30214
        
       

     

       30215
       30215
        
         lxi-tools = callPackage ../tools/networking/lxi-tools { };

     

       30216
       30216
       +
         lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };

     

       30216
       30217
        
       

     

       30217
       30218
        
         lynx = callPackage ../applications/networking/browsers/lynx { };

     

       30218
       30219