commit f3bf8a1b9dd6c80299fdb6bfc24d273d905b817c · pyrox.dev/nixpkgs

+59 -39

pkgs/applications/misc/bottles/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, gitUpdater

     

       2
       2
       -
       , meson, ninja, pkg-config, wrapGAppsHook

     

       3
       3
       -
       , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk

     

       4
       4
       -
       , python3Packages, gettext

     

       5
       5
       -
       , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome

     

       6
       6
       -
       , steam, xdg-utils, pciutils, cabextract

     

       7
       7
       -
       , freetype, p7zip, gamemode, mangohud

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , gitUpdater

     

       5
       5
       +
       , python3Packages

     

       6
       6
       +
       , blueprint-compiler

     

       7
       7
       +
       , meson

     

       8
       8
       +
       , ninja

     

       9
       9
       +
       , pkg-config

     

       10
       10
       +
       , wrapGAppsHook4

     

       11
       11
       +
       , appstream-glib

     

       12
       12
       +
       , desktop-file-utils

     

       13
       13
       +
       , librsvg

     

       14
       14
       +
       , gtk4

     

       15
       15
       +
       , gtksourceview5

     

       16
       16
       +
       , libadwaita

     

       17
       17
       +
       , steam

     

       18
       18
       +
       , cabextract

     

       19
       19
       +
       , p7zip

     

       20
       20
       +
       , xdpyinfo

     

       21
       21
       +
       , imagemagick

     

       22
       22
       +
       , procps

     

       23
       23
       +
       , gamescope

     

       24
       24
       +
       , mangohud

     

       25
       25
       +
       , vmtouch

     

       8
       26
        
       , wine

     

       9
       27
        
       , bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs

     

       10
       28
        
       , bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs

     
···

       21
       39
        
       in

     

       22
       40
        
       python3Packages.buildPythonApplication rec {

     

       23
       41
        
         pname = "bottles";

     

       24
       24
       -
         version = "2022.5.28-trento-3";

     

       42
       42
       +
         version = "2022.10.14.1";

     

       25
       43
        
       

     

       26
       44
        
         src = fetchFromGitHub {

     

       27
       45
        
           owner = "bottlesdevs";

     

       28
       46
        
           repo = pname;

     

       29
       47
        
           rev = version;

     

       30
       30
       -
           sha256 = "sha256-KIDLRqDLFTsVAczRpTchnUtKJfVHqbYzf8MhIR5UdYY=";

     

       48
       48
       +
           sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0=";

     

       31
       49
        
         };

     

       32
       50
        
       

     

       51
       51
       +
         patches = [ ./vulkan_icd.patch ];

     

       52
       52
       +
       

     

       33
       53
        
         postPatch = ''

     

       34
       54
        
           chmod +x build-aux/meson/postinstall.py

     

       35
       55
        
           patchShebangs build-aux/meson/postinstall.py

     

       36
       56
        
       

     

       37
       37
       -
           substituteInPlace src/backend/wine/winecommand.py \

     

       57
       57
       +
           substituteInPlace bottles/backend/wine/winecommand.py \

     

       38
       58
        
             --replace \

     

       39
       39
       -
               'self.__get_runner()' \

     

       40
       40
       -
               '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())'

     

       41
       41
       -
         '';

     

       59
       59
       +
               "command = f\"{runner} {command}\"" \

     

       60
       60
       +
               "command = f\"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}\"" \

     

       61
       61
       +
             --replace \

     

       62
       62
       +
               "command = f\"{_picked['entry_point']} {command}\"" \

     

       63
       63
       +
               "command = f\"${steam-run}/bin/steam-run {_picked['entry_point']} {command}\""

     

       64
       64
       +
           '';

     

       42
       65
        
       

     

       43
       66
        
         nativeBuildInputs = [

     

       67
       67
       +
           blueprint-compiler

     

       44
       68
        
           meson

     

       45
       69
        
           ninja

     

       46
       70
        
           pkg-config

     

       47
       47
       -
           wrapGAppsHook

     

       48
       48
       -
           gettext

     

       71
       71
       +
           wrapGAppsHook4

     

       72
       72
       +
           gtk4 # gtk4-update-icon-cache

     

       49
       73
        
           appstream-glib

     

       50
       74
        
           desktop-file-utils

     

       51
       75
        
         ];

     

       52
       76
        
       

     

       53
       77
        
         buildInputs = [

     

       54
       54
       -
           gdk-pixbuf

     

       55
       55
       -
           glib

     

       56
       56
       -
           gobject-introspection

     

       57
       57
       -
           gsettings-desktop-schemas

     

       58
       58
       -
           gspell

     

       59
       59
       -
           gtk3

     

       60
       60
       -
           gtksourceview4

     

       61
       61
       -
           libhandy

     

       62
       62
       -
           libnotify

     

       63
       63
       -
           webkitgtk

     

       64
       64
       -
           gnome.adwaita-icon-theme

     

       78
       78
       +
           librsvg

     

       79
       79
       +
           gtk4

     

       80
       80
       +
           gtksourceview5

     

       81
       81
       +
           libadwaita

     

       65
       82
        
         ];

     

       66
       83
        
       

     

       67
       84
        
         propagatedBuildInputs = with python3Packages; [

     

       68
       85
        
           pyyaml

     

       69
       69
       -
           pytoml

     

       70
       86
        
           requests

     

       71
       71
       -
           pycairo

     

       72
       87
        
           pygobject3

     

       73
       73
       -
           lxml

     

       74
       74
       -
           dbus-python

     

       75
       75
       -
           gst-python

     

       76
       76
       -
           liblarch

     

       77
       88
        
           patool

     

       78
       89
        
           markdown

     

       90
       90
       +
           fvs

     

       91
       91
       +
           pefile

     

       92
       92
       +
           urllib3

     

       93
       93
       +
           chardet

     

       94
       94
       +
           certifi

     

       95
       95
       +
           idna

     

       96
       96
       +
           pillow

     

       97
       97
       +
           orjson

     

       98
       98
       +
           icoextract

     

       79
       99
        
         ] ++ [

     

       80
       80
       -
           steam-run

     

       81
       81
       -
           xdg-utils

     

       82
       82
       -
           pciutils

     

       83
       100
        
           cabextract

     

       84
       84
       -
           wine

     

       85
       85
       -
           freetype

     

       86
       101
        
           p7zip

     

       87
       87
       -
           gamemode # programs.gamemode.enable

     

       102
       102
       +
           xdpyinfo

     

       103
       103
       +
           imagemagick

     

       104
       104
       +
           procps

     

       105
       105
       +
       

     

       106
       106
       +
           gamescope

     

       88
       107
        
           mangohud

     

       108
       108
       +
           vmtouch

     

       109
       109
       +
           wine

     

       89
       110
        
         ];

     

       90
       111
        
       

     

       91
       112
        
         format = "other";

     

       92
       92
       -
         strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943

     

       93
       113
        
         dontWrapGApps = true; # prevent double wrapping

     

       94
       114
        
       

     

       95
       115
        
         preFixup = ''

+13

pkgs/applications/misc/bottles/vulkan_icd.patch

···

       1
       1
       +
       diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py

     

       2
       2
       +
       index 6673493..07f70d1 100644

     

       3
       3
       +
       --- a/bottles/backend/utils/vulkan.py

     

       4
       4
       +
       +++ b/bottles/backend/utils/vulkan.py

     

       5
       5
       +
       @@ -29,6 +29,8 @@ class VulkanUtils:

     

       6
       6
       +
                "/etc/vulkan",

     

       7
       7
       +
                "/usr/local/share/vulkan",

     

       8
       8
       +
                "/usr/local/etc/vulkan"

     

       9
       9
       +
       +        "/run/opengl-driver/share/vulkan/",

     

       10
       10
       +
       +        "/run/opengl-driver-32/share/vulkan/",

     

       11
       11
       +
            ]

     

       12
       12
       +
            if "FLATPAK_ID" in os.environ:

     

       13
       13
       +
                __vk_icd_dirs += [

+31

pkgs/development/python-modules/fvs/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, orjson}:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "fvs";

     

       5
       5
       +
         version = "0.3.4";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit version;

     

       9
       9
       +
           pname = "FVS";

     

       10
       10
       +
           extension = "tar.gz";

     

       11
       11
       +
           sha256 = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         propagatedBuildInputs = [

     

       15
       15
       +
           orjson

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         # no tests in src

     

       19
       19
       +
         doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         pythonImportsCheck = [

     

       22
       22
       +
           "fvs"

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted";

     

       27
       27
       +
           homepage = "https://github.com/mirkobrombin/FVS";

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           maintainers = with maintainers; [ bryanasdev000 ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+31

pkgs/development/python-modules/icoextract/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pefile, pillow}:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "icoextract";

     

       5
       5
       +
         version = "0.1.4";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           extension = "tar.gz";

     

       10
       10
       +
           sha256 = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         propagatedBuildInputs = [

     

       14
       14
       +
           pefile

     

       15
       15
       +
           pillow

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         # tests expect mingw and multiarch

     

       19
       19
       +
         doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         pythonImportsCheck = [

     

       22
       22
       +
           "icoextract"

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "Extract icons from Windows PE files";

     

       27
       27
       +
           homepage = "https://github.com/jlu5/icoextract";

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           maintainers = with maintainers; [ bryanasdev000 ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       27600
       27600
        
         bonzomatic = callPackage ../applications/editors/bonzomatic { };

     

       27601
       27601
        
       

     

       27602
       27602
        
         bottles = callPackage ../applications/misc/bottles {

     

       27603
       27603
       -
           wine = wineWowPackages.minimal;

     

       27603
       27603
       +
           wine = null;

     

       27604
       27604
        
         };

     

       27605
       27605
        
       

     

       27606
       27606
        
         brave = callPackage ../applications/networking/browsers/brave { };

pkgs/top-level/python-packages.nix

···

       3560
       3560
        
       

     

       3561
       3561
        
         fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };

     

       3562
       3562
        
       

     

       3563
       3563
       +
         fvs = callPackage ../development/python-modules/fvs { };

     

       3564
       3564
       +
       

     

       3563
       3565
        
         fx2 = callPackage ../development/python-modules/fx2 { };

     

       3564
       3566
        
       

     

       3565
       3567
        
         g2pkk = callPackage ../development/python-modules/g2pkk { };

     
···

       4402
       4404
        
         ics = callPackage ../development/python-modules/ics { };

     

       4403
       4405
        
       

     

       4404
       4406
        
         idasen = callPackage ../development/python-modules/idasen { };

     

       4407
       4407
       +
       

     

       4408
       4408
       +
         icoextract = callPackage ../development/python-modules/icoextract { };

     

       4405
       4409
        
       

     

       4406
       4410
        
         icontract = callPackage ../development/python-modules/icontract { };

     

       4407
       4411