Vastly simplify

pikers · Jan 17, 2024 · b52af59 · b52af59
1 parent ff7bd05
commit b52af59
Showing 1 changed file with 0 additions and 73 deletions.
diff --git a/default.nix b/default.nix
@@ -5,20 +5,6 @@ let
   glibStorePath = lib.getLib glib;
   libglStorePath = lib.getLib libglvnd;
 
-  fconfStorePath = lib.getLib fontconfig;
-  freetypeStorePath = lib.getLib freetype;
-  x11StorePath = lib.getLib xorg.libX11;
-  xcbwmStorePath = lib.getLib xorg.xcbutilwm;
-  xcbimgStorePath = lib.getLib xorg.xcbutilimage;
-  libxcbStorePath = lib.getLib xorg.libxcb;
-  xcbutilStorePath = lib.getLib xorg.xcbutil;
-  xcbutilkeysStorePath = lib.getLib xorg.xcbutilkeysyms;
-  xcbutilrenderStorePath = lib.getLib xorg.xcbutilrenderutil;
-
-  libxkbcomStorePath = lib.getLib libxkbcommon;
-
-  dbusStorePath = lib.getLib dbus;
-
   pyqt5StorePath = lib.getLib pyqt5;
   pyqt5SipStorePath = lib.getLib pyqt5_sip;
 in
@@ -29,19 +15,6 @@ stdenv.mkDerivation {
     gcc-unwrapped
     glib
 
-    readline
-    fontconfig
-    freetype
-    xorg.libX11
-    xorg.xcbutilwm
-    xorg.xcbutilimage
-    xorg.libxcb
-    xorg.xcbutil
-    xorg.xcbutilkeysyms
-    xorg.xcbutilrenderutil
-
-    libxkbcommon
-
     libsForQt5.qt5.qtbase
 
     # Python requirements.
@@ -59,21 +32,6 @@ stdenv.mkDerivation {
 
     GCC_STORE_PATH="${gccStorePath}/lib"
     GLIB_STORE_PATH="${glibStorePath}/lib"
-    OPENGL_PATH="${libglStorePath}/lib"
-
-    FONTCONFIG_PATH="${fconfStorePath}/lib"
-    FREETYPE_PATH="${freetypeStorePath}/lib"
-    LIBX11_PATH="${x11StorePath}/lib"
-    XCBWM_PATH="${xcbwmStorePath}/lib"
-    XCBIMG_PATH="${xcbimgStorePath}/lib"
-    LIBXCB_PATH="${libxcbStorePath}/lib"
-    XCBUTL_PATH="${xcbutilStorePath}/lib"
-    XCBUTLKS_PATH="${xcbutilkeysStorePath}/lib"
-    XCBUTLRNDR_PATH="${xcbutilrenderStorePath}/lib"
-
-    LIBXKBCOM_PATH="${libxkbcomStorePath}/lib"
-
-    DBUS_PATH="${dbusStorePath}/lib"
 
     QTBASE_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}"
 
@@ -83,45 +41,14 @@ stdenv.mkDerivation {
     echo ""
     echo "gcc store path:     $GCC_STORE_PATH"
     echo "glib store path:    $GLIB_STORE_PATH"
-    echo "opengl path:        $OPENGL_PATH"
-    echo "fontconfig path:    $FONTCONFIG_PATH"
-    echo "freetype path:      $FREETYPE_PATH"
-    echo "libX11 path:        $LIBX11_PATH"
-    echo "xcbutilwm path:     $XCBWM_PATH"
-    echo "xcbutilimage path:  $XCBIMG_PATH"
-    echo "libxcb path:        $LIBXCB_PATH"
-    echo "xcbutil path:       $XCBUTL_PATH"
-    echo "xcbutilkeys path:   $XCBUTLKS_PATH"
-    echo "xcbutilrender path: $XCBUTLRNDR_PATH"
-    echo "libxkcommon path:   $LIBXKBCOM_PATH"
     echo ""
     echo "qtbase path:        $QTBASE_PATH"
-    echo ""
-    echo "dbus path:          $DBUS_PATH"
-    echo ""
 
     EXTRA_LD_PATHS=""
     EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$READLINE_PATH"
 
     EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$GCC_STORE_PATH"
     EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$GLIB_STORE_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$OPENGL_PATH"
-
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$FONTCONFIG_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$FREETYPE_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$LIBX11_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$XCBWM_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$XCBIMG_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$LIBXCB_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$XCBUTL_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$XCBUTLKS_PATH"
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$XCBUTLRNDR_PATH"
-
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$LIBXKBCOM_PATH"
-
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$DBUS_PATH"
-
-    EXTRA_LD_PATHS="$EXTRA_LD_PATHS:$QTBASE_PATH"
 
     # Augment the dynamic linker path
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_LD_PATHS"