Unverified Commit 233631a8 authored by quantenzitrone's avatar quantenzitrone
Browse files

treewide: remove references to the xorg namespace in `pkgs` (manual) 

this was done manually, fixing the eval and any remaining stuff of the previous commit

together with the previous commit this shouldn't create any rebuilds
parent 7d8132a9

pkgs/applications/graphics/imlibsetroot/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchurl,

  libX11,

  libXinerama,

  libxinerama,

  imlib2,

}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation { 
  buildInputs = [

    libX11

    imlib2

    libXinerama

    libxinerama

  ];



  buildPhase = ''

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  patchelf,

  makeWrapper,

  wayland,

  libX11,

  libx11,

}:

let

  virtualboxVersion = "7.2.4";
@@ -61,7 +61,7 @@ let 
    }

    {

      name = "libX11.so";

      pkg = libX11;

      pkg = libx11;

    }

    {

      name = "libXt.so";

pkgs/by-name/ah/ahk_x11/package.nix

+8 −13
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ 
  copyDesktopItems,

  gtk3,

  libxkbcommon,

  xorg,

  libxinerama,

  libxtst,

  libxext,

  libxi,

  libnotify,

  gobject-introspection, # needed to build gi-crystal

  openbox,
@@ -21,14 +24,6 @@ 
let

  pname = "ahk_x11";

  version = "1.0.7";



  inherit (xorg)

    libXinerama

    libXtst

    libXext

    libXi

    ;



in

crystal.buildCrystalPackage {

  inherit pname version;
@@ -75,10 +70,10 @@ crystal.buildCrystalPackage { 
  buildInputs = [

    gtk3

    libxkbcommon

    libXinerama

    libXtst

    libXext

    libXi

    libxinerama

    libxtst

    libxext

    libxi

    libnotify

  ];

  nativeBuildInputs = [

pkgs/by-name/cy/cypress/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
  stdenv,

  udev,

  unzip,

  xorg,

}:



let

pkgs/by-name/fe/feather-tk/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  nativefiledialog-extended,

  nlohmann_json,

  plutovg,

  xvfb,

  xvfb-run,

  zlib,

  python3Packages ? null,

  enableNFD ? true,