diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/tools/package-management | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/conda/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 |
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; |