Replace xlibs with xorg

Author: SCOTT-HAMILTON

pkgs/instantLock/default.nix~

@@ -2,7 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , gnumake
-, xlibs
 }:
 stdenv.mkDerivation {
 

pkgs/instantLogo/default.nix

@@ -2,11 +2,13 @@
 , stdenv
 , fetchFromGitHub
 , gnumake
-, xlibs
 , instantUtils
+, libX11
+, libXft
+, libXinerama
 }:
-stdenv.mkDerivation {
 
+stdenv.mkDerivation {
   pname = "instantMenu";
   version = "unstable";
 
@@ -19,7 +21,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ gnumake ];
-  buildInputs = with xlibs; map lib.getDev [ libX11 libXft libXinerama ];
+  buildInputs = [ libX11 libXft libXinerama ];
   propagatedBuildInputs = [ instantUtils ];
 
   postPatch = ''

pkgs/instantMenu/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , gnumake
-, xlibs
 , pavucontrol
 , rofi
 , rxvt_unicode
@@ -12,6 +11,9 @@
 , instantAssist
 , instantUtils
 , instantDotfiles
+, libX11
+, libXft
+, libXinerama
 , wmconfig ? null
 , extraPatches ? []
 , defaultTerminal ? st
@@ -33,7 +35,6 @@ stdenv.mkDerivation {
   version = "unstable";
 
   src = fetchFromGitHub gitrev;
-  #src = ../../src/instantwm;
 
   patches = [ ] ++ extraPatches;
 
@@ -52,7 +53,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gnumake ];
-  buildInputs = with xlibs; map lib.getDev [ libX11 libXft libXinerama ];
+  buildInputs = [ libX11 libXft libXinerama ];
   propagatedBuildInputs = [
     cantarell-fonts
     #joypixels

pkgs/instantWm/default.nix

@@ -2,8 +2,10 @@
 , stdenv
 , fetchFromGitHub
 , gnumake
-, xlibs
 , instantAssist
+, libX11
+, libXft
+, libXinerama
 }:
 stdenv.mkDerivation {
 
@@ -26,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gnumake ];
-  buildInputs = with xlibs; map lib.getDev [ libX11 libXft libXinerama ];
+  buildInputs = [ libX11 libXft libXinerama ];
 
   propagatedBuildInputs = [ instantAssist ];