commit 1b5df99e7aefbeb7e0566bf819f502908399488c · pyrox.dev/nixpkgs

+3 -2

nixos/modules/hardware/video/nvidia.nix

···

       111
       111
        
         config = mkIf enabled {

     

       112
       112
        
           assertions = [

     

       113
       113
        
             {

     

       114
       114
       -
               assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;

     

       115
       115
       -
               message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";

     

       114
       114
       +
               assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable;

     

       115
       115
       +
               message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";

     

       116
       116
        
             }

     

       117
       117
       +
       

     

       117
       118
        
             {

     

       118
       119
        
               assertion = !optimusCfg.enable ||

     

       119
       120
        
                 (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");

+24 -1

nixos/modules/services/x11/display-managers/gdm.nix

···

       126
       126
        
             wayland = mkOption {

     

       127
       127
        
               default = true;

     

       128
       128
        
               description = ''

     

       129
       129
       -
                 Allow GDM run on Wayland instead of Xserver

     

       129
       129
       +
                 Allow GDM to run on Wayland instead of Xserver.

     

       130
       130
       +
                 Note to enable Wayland with Nvidia you need to

     

       131
       131
       +
                 enable the <option>nvidiaWayland</option>.

     

       130
       132
        
               '';

     

       131
       133
        
               type = types.bool;

     

       134
       134
       +
             };

     

       135
       135
       +
       

     

       136
       136
       +
             nvidiaWayland = mkOption {

     

       137
       137
       +
               default = false;

     

       138
       138
       +
               description = ''

     

       139
       139
       +
                 Whether to allow wayland to be used with the proprietary

     

       140
       140
       +
                 NVidia graphics driver.

     

       141
       141
       +
               '';

     

       132
       142
        
             };

     

       133
       143
        
       

     

       134
       144
        
             autoSuspend = mkOption {

     
···

       236
       246
        
           services.accounts-daemon.enable = true;

     

       237
       247
        
       

     

       238
       248
        
           services.dbus.packages = [ gdm ];

     

       249
       249
       +
       

     

       250
       250
       +
           # We duplicate upstream's udev rules manually to make wayland with nvidia configurable

     

       251
       251
       +
           services.udev.extraRules = ''

     

       252
       252
       +
             # disable Wayland on Cirrus chipsets

     

       253
       253
       +
             ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland"

     

       254
       254
       +
             # disable Wayland on Hi1710 chipsets

     

       255
       255
       +
             ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland"

     

       256
       256
       +
             ${optionalString (!cfg.gdm.nvidiaWayland) ''

     

       257
       257
       +
               DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland"

     

       258
       258
       +
             ''}

     

       259
       259
       +
             # disable Wayland when modesetting is disabled

     

       260
       260
       +
             IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland"

     

       261
       261
       +
           '';

     

       239
       262
        
       

     

       240
       263
        
           systemd.user.services.dbus.wantedBy = [ "default.target" ];

     

       241
       264

+4 -1

pkgs/desktops/gnome-3/core/mutter/default.nix

···

       10
       10
        
       , sysprof

     

       11
       11
        
       , desktop-file-utils

     

       12
       12
        
       , libcap_ng

     

       13
       13
       +
       , egl-wayland

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       stdenv.mkDerivation rec {

     
···

       26
       27
        
         mesonFlags = [

     

       27
       28
        
           "-Dxwayland-path=${xwayland}/bin/Xwayland"

     

       28
       29
        
           "-Dinstalled_tests=false" # TODO: enable these

     

       30
       30
       +
           "-Dwayland_eglstream=true"

     

       31
       31
       +
           "-Degl_device=true"

     

       29
       32
        
         ];

     

       30
       33
        
       

     

       31
       34
        
         propagatedBuildInputs = [

     
···

       52
       55
        
           gnome-desktop cairo pango cogl zenity libstartup_notification

     

       53
       56
        
           geocode-glib libinput libgudev libwacom

     

       54
       57
        
           libcanberra-gtk3 zenity xkeyboard_config libxkbfile

     

       55
       55
       -
           libxkbcommon pipewire xwayland

     

       58
       58
       +
           libxkbcommon pipewire xwayland egl-wayland

     

       56
       59
        
           gnome-settings-daemon sysprof

     

       57
       60
        
         ];

     

       58
       61

+73

pkgs/development/libraries/egl-wayland/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pkgconfig

     

       5
       5
       +
       , meson

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , libX11

     

       8
       8
       +
       , mesa

     

       9
       9
       +
       , wayland

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       let

     

       13
       13
       +
         eglexternalplatform = stdenv.mkDerivation {

     

       14
       14
       +
           pname = "eglexternalplatform";

     

       15
       15
       +
           version = "1.1";

     

       16
       16
       +
       

     

       17
       17
       +
           src = fetchFromGitHub {

     

       18
       18
       +
             owner = "Nvidia";

     

       19
       19
       +
             repo = "eglexternalplatform";

     

       20
       20
       +
             rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86";

     

       21
       21
       +
             sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb";

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           installPhase = ''

     

       25
       25
       +
             mkdir -p "$out/include/"

     

       26
       26
       +
             cp interface/eglexternalplatform.h "$out/include/"

     

       27
       27
       +
             cp interface/eglexternalplatformversion.h "$out/include/"

     

       28
       28
       +
       

     

       29
       29
       +
             substituteInPlace eglexternalplatform.pc \

     

       30
       30
       +
               --replace "/usr/include/EGL" "$out/include"

     

       31
       31
       +
             mkdir -p "$out/share/pkgconfig"

     

       32
       32
       +
             cp eglexternalplatform.pc "$out/share/pkgconfig/"

     

       33
       33
       +
           '';

     

       34
       34
       +
       

     

       35
       35
       +
           meta = with lib; {

     

       36
       36
       +
             license = licenses.mit;

     

       37
       37
       +
           };

     

       38
       38
       +
         };

     

       39
       39
       +
       

     

       40
       40
       +
       in stdenv.mkDerivation rec {

     

       41
       41
       +
         pname = "egl-wayland";

     

       42
       42
       +
         version = "1.1.4";

     

       43
       43
       +
       

     

       44
       44
       +
         outputs = [ "out" "dev" ];

     

       45
       45
       +
       

     

       46
       46
       +
         src = fetchFromGitHub {

     

       47
       47
       +
           owner = "Nvidia";

     

       48
       48
       +
           repo = pname;

     

       49
       49
       +
           rev = version;

     

       50
       50
       +
           sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";

     

       51
       51
       +
         };

     

       52
       52
       +
       

     

       53
       53
       +
         nativeBuildInputs = [

     

       54
       54
       +
           meson

     

       55
       55
       +
           ninja

     

       56
       56
       +
           pkgconfig

     

       57
       57
       +
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         buildInputs = [

     

       60
       60
       +
           eglexternalplatform

     

       61
       61
       +
           libX11

     

       62
       62
       +
           mesa

     

       63
       63
       +
           wayland

     

       64
       64
       +
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         meta = with lib; {

     

       67
       67
       +
           description = "The EGLStream-based Wayland external platform";

     

       68
       68
       +
           homepage = https://github.com/NVIDIA/egl-wayland/;

     

       69
       69
       +
           license = licenses.mit;

     

       70
       70
       +
           platforms = platforms.linux;

     

       71
       71
       +
           maintainers = with maintainers; [ hedning ];

     

       72
       72
       +
         };

     

       73
       73
       +
       }

+3 -1

pkgs/servers/x11/xorg/xwayland.nix

···

       1
       1
       -
       { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:

     

       1
       1
       +
       { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       xorgserver.overrideAttrs (oldAttrs: {

     

       6
       6
        
       

     

       7
       7
        
         name = "xwayland-${xorgserver.version}";

     

       8
       8
       +
         buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ];

     

       8
       9
        
         propagatedBuildInputs = oldAttrs.propagatedBuildInputs

     

       9
       10
        
           ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];

     

       10
       11
        
         configureFlags = [

     

       11
       12
        
           "--disable-docs"

     

       12
       13
        
           "--disable-devel-docs"

     

       13
       14
        
           "--enable-xwayland"

     

       15
       15
       +
           "--enable-xwayland-eglstream"

     

       14
       16
        
           "--disable-xorg"

     

       15
       17
        
           "--disable-xvfb"

     

       16
       18
        
           "--disable-xnest"

pkgs/top-level/all-packages.nix

···

       11030
       11030
        
           inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;

     

       11031
       11031
        
         };

     

       11032
       11032
        
       

     

       11033
       11033
       +
         egl-wayland = callPackage ../development/libraries/egl-wayland {};

     

       11034
       11034
       +
       

     

       11033
       11035
        
         elastix = callPackage ../development/libraries/science/biology/elastix { };

     

       11034
       11036
        
       

     

       11035
       11037
        
         enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };