From 1dd33efea9493932c85447fecd8eb691f7369c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=C3=A1n=20F=2E=20Mu=C3=B1oz?= Date: Fri, 6 Dec 2024 16:55:26 -0500 Subject: [PATCH] clean: remove unnecessary NIX_LD --- flake.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index aed99af..455176f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,36 +23,21 @@ in with pkgs; rec { - callPackage = lib.callPackageWith (pkgs // mypackages // python3Packages); + callPackage = lib.callPackageWith (pkgs // packages // python3Packages); - mypackages = { + packages = { centrosome = callPackage ./nix/centrosome.nix {}; }; - # formatter = pkgs.alejandra; devShells = { default = let python_with_pkgs = (pkgs.python3.withPackages(pp: [ - mypackages.centrosome + packages.centrosome ])); in mkShell { - NIX_LD = runCommand "ld.so" {} '' - ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out - ''; - NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [ - # Add needed packages here - stdenv.cc.cc - libGL - zlib - glib - ]; packages = [ python_with_pkgs - # git - # gtk3 - glib - pkg-config ]; venvDir = "./.venv"; postVenvCreation = '' @@ -62,7 +47,6 @@ unset SOURCE_DATE_EPOCH ''; shellHook = '' - export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH runHook venvShellHook export PYTHONPATH=${python_with_pkgs}/${python_with_pkgs.sitePackages}:$PYTHONPATH '';