Skip to content

Commit

Permalink
lib: get rid of "with lib;"
Browse files Browse the repository at this point in the history
  • Loading branch information
lopsided98 committed Aug 5, 2023
1 parent 5f92686 commit 9417386
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lib/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ lib ? rosSelf.lib or self.lib
, self ? null
, rosSelf ? null }:
with lib;
{
mkOverlay = overlays: let
s = composeManyExtensions overlays s {};
s = lib.composeManyExtensions overlays s {};
in s;

# Create a tarball of a package source. If the source is already an archive,
Expand Down Expand Up @@ -32,8 +31,8 @@ with lib;
postPatch ? "", ...
}: {
postPatch = ''
substituteInPlace ${escapeShellArg file} \
--replace ${escapeShellArg originalUrl} ${escapeShellArg (self.fetchurl { inherit url hash sha256; })}
substituteInPlace ${lib.escapeShellArg file} \
--replace ${lib.escapeShellArg originalUrl} ${lib.escapeShellArg (self.fetchurl { inherit url hash sha256; })}
'' + postPatch;
});

Expand All @@ -48,7 +47,7 @@ with lib;
postPatch = ''
sed -i '\|GIT_REPOSITORY\s.*${originalUrl}|c\
URL "${self.fetchgit ({ inherit url; } // fetchgitArgs)}"' \
${escapeShellArg file}
${lib.escapeShellArg file}
'' + postPatch;
});

Expand Down

0 comments on commit 9417386

Please sign in to comment.