Skip to content

Commit

Permalink
swiftpm2nix: fix prefetch regression by downgrading nix
Browse files Browse the repository at this point in the history
  • Loading branch information
ofalvai committed Nov 23, 2024
1 parent 2107702 commit 11f9029
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions pkgs/development/compilers/swift/swiftpm2nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }:
{
lib,
stdenv,
callPackage,
makeWrapper,
jq,
nix-prefetch-git,
nixVersions,
}:

let
# https://github.com/NixOS/nix/issues/11681
nix-prefetch-git' = nix-prefetch-git.override { nix = nixVersions.nix_2_19; };
in
stdenv.mkDerivation {
name = "swiftpm2nix";

Expand All @@ -10,7 +22,12 @@ stdenv.mkDerivation {
installPhase = ''
install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix
wrapProgram $out/bin/$name \
--prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \
--prefix PATH : ${
lib.makeBinPath [
jq
nix-prefetch-git'
]
} \
'';

preferLocalBuild = true;
Expand Down

0 comments on commit 11f9029

Please sign in to comment.