Unverified Commit 78c1924b authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

treewide: remove references to the xorg namespace in `pkgs/` (#482814)

parents b53818f7 233631a8

pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix

+12 −7
Original line number Diff line number Diff line
@@ -19,7 +19,12 @@ 
  pulseaudio,

  wrapGAppsHook3,

  xdg-utils,

  xorg,

  libxcb-util,

  libxcb-wm,

  libxtst,

  libxcursor,

  libx11,

  libxcb,

  zlib,

}:
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec { 
  dontBuild = true;

  dontWrapGApps = true; # we only want $gappsWrapperArgs here



  buildInputs = with xorg; [

  buildInputs = [

    alsa-lib

    cairo

    freetype
@@ -53,15 +58,15 @@ stdenv.mkDerivation rec { 
    # libjpeg8 is required for converting jpeg's to colour palettes

    libjpeg

    libxcb

    libXcursor

    libX11

    libXtst

    libxcursor

    libx11

    libxtst

    libxkbcommon

    pipewire

    pulseaudio

    (lib.getLib stdenv.cc.cc)

    xcbutil

    xcbutilwm

    libxcb-util

    libxcb-wm

    zlib

  ];

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

+12 −7
Original line number Diff line number Diff line
@@ -26,7 +26,12 @@ 
  wrapGAppsHook3,

  xcb-imdkit,

  xdg-utils,

  xorg,

  libxcb-util,

  libxcb-wm,

  libxtst,

  libxcursor,

  libx11,

  libxcb,

  zlib,

}:
@@ -64,10 +69,10 @@ stdenv.mkDerivation rec { 
    # libjpeg8 is required for converting jpeg's to colour palettes

    libjpeg

    libnghttp2

    xorg.libxcb

    xorg.libXcursor

    xorg.libX11

    xorg.libXtst

    libxcb

    libxcursor

    libx11

    libxtst

    libxkbcommon

    libudev-zero

    pango
@@ -75,8 +80,8 @@ stdenv.mkDerivation rec { 
    (lib.getLib stdenv.cc.cc)

    vulkan-loader

    xcb-imdkit

    xorg.xcbutil

    xorg.xcbutilwm

    libxcb-util

    libxcb-wm

    zlib

  ];

pkgs/applications/audio/open-music-kontrollers/mephisto.nix

+4 −3
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
  lv2,

  lv2lint,

  sord,

  xorg,

  libxext,

  libx11,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -41,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { 
    libvterm-neovim

    lv2

    sord

    xorg.libX11

    xorg.libXext

    libx11

    libxext

    glew

    lv2lint

  ];

pkgs/applications/backup/timeshift/wrapper.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  wrapGAppsHook3,

  gdk-pixbuf,

  librsvg,

  xorg,

  lndir,

  shared-mime-info,

}:
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { 


  nativeBuildInputs = [

    wrapGAppsHook3

    xorg.lndir

    lndir

  ];



  installPhase = ''

pkgs/applications/editors/android-studio/common.nix

+4 −3
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ 
  runCommand,

  wayland,

  xkeyboard_config,

  xorg,

  libsm,

  libice,

  zlib,

  makeDesktopItem,

  tiling_wm, # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper
@@ -175,8 +176,8 @@ let 
            xcbutilkeysyms

            xcbutilimage

            xcbutilcursor

            xorg.libICE

            xorg.libSM

            libice

            libsm

            libxkbfile

            libXcomposite

            libXcursor