commit 9ed63709bc3cadecbd4484e24f0f7ed47188b464 · pyrox.dev/nixpkgs

+1

nixos/modules/services/desktops/flatpak.nix

···

       35
       35
        
           services.dbus.packages = [ pkgs.flatpak ];

     

       36
       36
        
       

     

       37
       37
        
           systemd.packages = [ pkgs.flatpak ];

     

       38
       38
       +
           systemd.tmpfiles.packages = [ pkgs.flatpak ];

     

       38
       39
        
       

     

       39
       40
        
           environment.profiles = [

     

       40
       41
        
             "$HOME/.local/share/flatpak/exports"

+1

nixos/tests/installed-tests/flatpak.nix

···

       7
       7
        
         testConfig = {

     

       8
       8
        
           xdg.portal.enable = true;

     

       9
       9
        
           xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];

     

       10
       10
       +
           xdg.portal.config.common.default = "gtk";

     

       10
       11
        
           services.flatpak.enable = true;

     

       11
       12
        
           environment.systemPackages = with pkgs; [ gnupg ostree python3 ];

     

       12
       13
        
           virtualisation.memorySize = 2047;

+2 -2

pkgs/development/libraries/flatpak/default.nix

···

       54
       54
        
       

     

       55
       55
        
       stdenv.mkDerivation (finalAttrs: {

     

       56
       56
        
         pname = "flatpak";

     

       57
       57
       -
         version = "1.14.4";

     

       57
       57
       +
         version = "1.14.5";

     

       58
       58
        
       

     

       59
       59
        
         # TODO: split out lib once we figure out what to do with triggerdir

     

       60
       60
        
         outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];

     

       61
       61
        
       

     

       62
       62
        
         src = fetchurl {

     

       63
       63
        
           url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";

     

       64
       64
       -
           sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/

     

       64
       64
       +
           sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/

     

       65
       65
        
         };

     

       66
       66
        
       

     

       67
       67
        
         patches = [

+9 -3

pkgs/development/libraries/flatpak/fix-test-paths.patch

···

       63
       63
        
        flatpak build-finish ${DIR} >&2

     

       64
       64
        
        mkdir -p repos

     

       65
       65
        
       diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh

     

       66
       66
       -
       index 4ba950df..fd50fab3 100755

     

       66
       66
       +
       index 6345ff58..fd50fab3 100755

     

       67
       67
        
       --- a/tests/make-test-runtime.sh

     

       68
       68
        
       +++ b/tests/make-test-runtime.sh

     

       69
       69
        
       @@ -28,9 +28,10 @@ EOF

     
···

       78
       78
        
        mkdir -p ${DIR}/usr/bin

     

       79
       79
        
        mkdir -p ${DIR}/usr/lib

     

       80
       80
        
        ln -s ../lib ${DIR}/usr/lib64

     

       81
       81
       -
       @@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then

     

       81
       81
       +
       @@ -40,46 +41,17 @@ if test -f /sbin/ldconfig.real; then

     

       82
       82
        
        else

     

       83
       83
        
            cp "$(type -P ldconfig)" "${DIR}/usr/bin"

     

       84
       84
        
        fi

     
···

       88
       88
        
       -add_bin() {

     

       89
       89
        
       -    local f=$1

     

       90
       90
        
       -    shift

     

       91
       91
       +
       -

     

       92
       92
       +
       -    # Check if the program is installed

     

       93
       93
       +
       -    if ! command -v "${f}" &> /dev/null; then

     

       94
       94
       +
       -        echo "${f} not found"

     

       95
       95
       +
       -        exit 1

     

       96
       96
       +
       -    fi

     

       91
       97
        
       -

     

       92
       98
        
       -    if grep -qFe "${f}" $BINS; then

     

       93
       99
        
       -        # Already handled

     
···

       129
       135
        
        done

     

       130
       136
        
        ln -s bash ${DIR}/usr/bin/sh

     

       131
       137
        
        

     

       132
       132
       -
       @@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA"

     

       138
       138
       +
       @@ -90,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA"

     

       133
       139
        
        EOF

     

       134
       140
        
        chmod a+x ${DIR}/usr/bin/runtime_hello.sh

     

       135
       141

+4 -4

pkgs/development/libraries/flatpak/unset-env-vars.patch

···

       1
       1
        
       diff --git a/common/flatpak-run.c b/common/flatpak-run.c

     

       2
       2
       -
       index 8fa8c0e0..e1cdeba0 100644

     

       2
       2
       +
       index 6f54a9d0..102d9b90 100644

     

       3
       3
        
       --- a/common/flatpak-run.c

     

       4
       4
        
       +++ b/common/flatpak-run.c

     

       5
       5
       -
       @@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {

     

       6
       6
       -
          {"XKB_CONFIG_ROOT", NULL},

     

       7
       7
       -
          {"GIO_EXTRA_MODULES", NULL},

     

       5
       5
       +
       @@ -1902,6 +1902,7 @@ static const ExportData default_exports[] = {

     

       8
       6
        
          {"GDK_BACKEND", NULL},

     

       7
       7
       +
          {"VK_DRIVER_FILES", NULL},

     

       8
       8
       +
          {"VK_ICD_FILENAMES", NULL},

     

       9
       9
        
       +  {"GDK_PIXBUF_MODULE_FILE", NULL},

     

       10
       10
        
        };

     

       11
       11