about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/package-management
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
-rw-r--r--nixpkgs/pkgs/tools/package-management/conda/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/conda/default.nix b/nixpkgs/pkgs/tools/package-management/conda/default.nix
index 5ddcee6d1d33..71dd78618081 100644
--- a/nixpkgs/pkgs/tools/package-management/conda/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/conda/default.nix
@@ -5,6 +5,7 @@
 , makeWrapper
 , buildFHSUserEnv
 , libselinux
+, libarchive
 , xorg
 # Conda installs its packages and environments under this directory
 , installationPath ? "~/.conda"
@@ -59,6 +60,7 @@ in
       # Some other required environment variables
       export FONTCONFIG_FILE=/etc/fonts/fonts.conf
       export QTCOMPOSE=${xorg.libX11}/share/X11/locale
+      export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so
     '';
 
     meta = {
diff --git a/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index ba47847f28b6..c23db106ea1f 100644
--- a/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -8,7 +8,7 @@ let mkPrefetchScript = tool: src: deps:
 
     nativeBuildInputs = [ makeWrapper ];
 
-    unpackPhase = ":";
+    dontUnpack = true;
 
     installPhase = ''
       install -vD ${src} $out/bin/$name;