public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-prefetch: make fit for flakes

Browse Source
This commit is contained in:
Jörg Thalheim 2020-08-11 05:36:38 +01:00
parent 1ae9146803
commit 346874b79e
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/package-management/nix-prefetch/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc { stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
, gnugrep, gnused, jq, nix }: , gnugrep, gnused, jq, nix, fetchpatch }:
let let
binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
@ -20,6 +20,14 @@ in stdenv.mkDerivation rec {
''; '';
}; };
patches = [
# Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8
(fetchpatch {
url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch";
sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x";
})
];
postPatch = '' postPatch = ''
lib=$out/lib/${pname} lib=$out/lib/${pname}