diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-21 06:45:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 06:45:45 +0000 |
| commit | df8b20163b90574f98eb7c0d4857bcf9a1bdc865 (patch) | |
| tree | c1643593b8f8f5ee1a913b767c65fed4a67d09b7 /pkgs/misc | |
| parent | 762f665963c4082ef20e328d6bbb22202ee2c33d (diff) | |
| parent | a6245e9bdf3fa2c372cb5c9a74f385dabf186dd3 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/util.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/source-and-tags/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix index b90a68e72df5..cd5bd03130b6 100644 --- a/pkgs/misc/emulators/wine/util.nix +++ b/pkgs/misc/emulators/wine/util.nix @@ -3,7 +3,7 @@ rec { toPackages = pkgNames: pkgs: map (pn: lib.getAttr pn pkgs) pkgNames; toBuildInputs = pkgArches: archPkgs: - lib.concatLists (map archPkgs pkgArches); + lib.concatLists (map archPkgs pkgArches); mkBuildInputs = pkgArches: pkgNames: toBuildInputs pkgArches (toPackages pkgNames); } diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 7c082cbbbb0f..c82b96b82f95 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir - annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags + annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now # that's why I'm abusing meta for the same purpose in ghcsAndLibs @@ -10,7 +10,7 @@ # createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ] # tag command must create file named $TAG_FILE - sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : + sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : stdenv.mkDerivation { phases = "unpackPhase buildPhase"; inherit src srcDir tagSuffix; @@ -72,7 +72,7 @@ addCTaggingInfo = deriv : - deriv // { + deriv // { passthru = { sourceWithTags = { inherit (deriv) src; |