Unverified Commit 5cfba53f authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #258812 from Izorkin/fix-noxlibs 

nixos/no-x-libs: fix build packages
parents 98a307aa 2e14d8ba

nixos/modules/config/no-x-libs.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ with lib; 
      qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };

      qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });

      qt5 = super.qt5.overrideScope (const (super': {

        qtbase = super'.qtbase.override { withGtk3 = false; };

        qtbase = super'.qtbase.override { withGtk3 = false; withQttranslation = false; };

      }));

      stoken = super.stoken.override { withGTK3 = false; };

      # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11

pkgs/development/libraries/pipewire/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
, mysofaSupport ? true

, libmysofa

, tinycompress

, ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform

, ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform

, ffado

, libselinux

}:

pkgs/development/libraries/qt-5/modules/qtbase.nix

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  # optional dependencies

, cups ? null, postgresql ? null

, withGtk3 ? false, dconf, gtk3

, qttranslations ? null

, withQttranslation ? true, qttranslations ? null



  # options

, libGLSupported ? !stdenv.isDarwin
@@ -351,7 +351,8 @@ stdenv.mkDerivation (finalAttrs: ({ 
    ] ++ lib.optionals (mysqlSupport) [

      "-L" "${libmysqlclient}/lib"

      "-I" "${libmysqlclient}/include"

    ] ++ lib.optional (qttranslations != null) [

    ] ++ lib.optional (withQttranslation && (qttranslations != null)) [

      # depends on x11

      "-translationdir" "${qttranslations}/translations"

    ]

  );