git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95137 from Mic92/nix-prefetch

nix-prefetch: make fit for flakes

commitc1c96de9e7537fd08a074012d2fa23a6f4b7a419 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 11 Aug 2020, 00:53 (6 years ago) parent48ef856346874b
1 file changed+9−1
pkgs/tools/package-management/nix-prefetch/default.nix+9−1
pkgs/tools/package-management/nix-prefetch/default.nix+9−1
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
22, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
3−, gnugrep, gnused, jq, nix }:
3+, gnugrep, gnused, jq, nix, fetchpatch }:
44
55let
66 binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
@@ -20,6 +20,14 @@ in stdenv.mkDerivation rec {
2020 '';
2121 };
2222
23+ patches = [
24+ # Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8
25+ (fetchpatch {
26+ url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch";
27+ sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x";
28+ })
29+ ];
30+
2331 postPatch = ''
2432 lib=$out/lib/${pname}
2533