From 1299e63e5bbc4a3c0da99ac8c9f14ec834412bd9 Mon Sep 17 00:00:00 2001
From: Nelson Torres <nelson.torres.alvarado1@gmail.com>
Date: Tue, 28 Jan 2025 16:31:46 -0300
Subject: [PATCH] update

---
 default.nix | 63 -----------------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/default.nix b/default.nix
index 6d823de8..58694287 100644
--- a/default.nix
+++ b/default.nix
@@ -50,11 +50,7 @@ stdenv.mkDerivation {
 
     # Python requirements.
     python312Full
-<<<<<<< HEAD
-    python312Packages.poetry-core
-=======
     python312Packages.uv
->>>>>>> 4b64ded2 (necessary libraries for qt6)
     python312Packages.qdarkstyle
     python312Packages.rapidfuzz
     python312Packages.pyqt6
@@ -79,7 +75,6 @@ stdenv.mkDerivation {
     FREETYPE_PATH="${freetypeStorePath}/lib"
     FONTCONFIG_PATH="${fontconfigStorePath}/lib"
     LIB_XKB_COMMON_PATH="${libxkbcommonStorePath}/lib"
-<<<<<<< HEAD
 
     XCB_UTIL_CURSOR_PATH="${xcbutilcursorStorePath}/lib"
     XORG_LIB_X11_PATH="${xorgLibX11StorePath}/lib"
@@ -127,67 +122,9 @@ stdenv.mkDerivation {
     PATCH="$PATCH:$PYQT6_SIP_PATH"
 
     export PATCH
-=======
->>>>>>> 4b64ded2 (necessary libraries for qt6)
-
-    XCB_UTIL_CURSOR_PATH="${xcbutilcursorStorePath}/lib"
-    XORG_LIB_X11_PATH="${xorgLibX11StorePath}/lib"
-    XORG_LIB_XCB_PATH="${xorgLibxcbStorePath}/lib"
-    XORG_XCB_UTIL_IMAGE_PATH="${xorgxcbutilimageStorePath}/lib"
-    XORG_XCB_UTIL_WM_PATH="${xorgxcbutilwmStorePath}/lib"
-    XORG_XCB_UTIL_RENDER_UTIL_PATH="${xorgxcbutilrenderutilStorePath}/lib"
-    XORG_XCB_UTIL_KEYSYMS_PATH="${xorgxcbutilkeysymsStorePath}/lib"
-    XORG_XCB_UTIL_ERRORS_PATH="${xorgxcbutilerrorsStorePath}/lib"
-
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QTBASE_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_PLUGIN_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_QPA_PLATFORM_PLUGIN_PATH"
-
-<<<<<<< HEAD
-    if grep -q "$PATCH" "$ACTIVATE_SCRIPT_PATH"; then
-        echo "venv is already patched."
-    else
-        echo "patching $ACTIVATE_SCRIPT_PATH to use pyqt6 from nixos..."
-        sed -i "\$i$PATCH" $ACTIVATE_SCRIPT_PATH
-    fi
-=======
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GLIB_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZSTD_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBGL_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FONTCONFIG_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FREETYPE_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_XKB_COMMON_PATH"
-
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XCB_UTIL_CURSOR_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_LIB_X11_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_LIB_XCB_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_IMAGE_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_WM_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_RENDER_UTIL_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_KEYSYMS_PATH"
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_ERRORS_PATH"
-
-    export LD_LIBRARY_PATH
-
-    RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.12/site-packages"
-    QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.12/site-packages"
-    QTPY_PATH="${qtpyStorePath}/lib/python3.12/site-packages"
-    PYQT6_PATH="${pyqt6StorePath}/lib/python3.12/site-packages"
-    PYQT6_SIP_PATH="${pyqt6SipStorePath}/lib/python3.12/site-packages"
-
-    PATCH="$PATCH:$RPDFUZZ_PATH"
-    PATCH="$PATCH:$QDRKSTYLE_PATH"
-    PATCH="$PATCH:$QTPY_PATH"
-    PATCH="$PATCH:$PYQT6_PATH"
-    PATCH="$PATCH:$PYQT6_SIP_PATH"
-
-    export PATCH
 
     # Install deps
     uv lock
->>>>>>> 4b64ded2 (necessary libraries for qt6)
 
   '';
 }