diff options
| author | Artturi <Artturin@artturin.com> | 2022-12-23 18:50:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 18:50:57 +0200 |
| commit | 0fbd19f3d9125184212f0f3a7cdb34214a5be48d (patch) | |
| tree | 6c2951634dd5ada824d9740dca531fa91dcb970c /pkgs/development | |
| parent | 154c9b56a440f22f22ef8ee698d0f95aca7a9bea (diff) | |
| parent | 065b54ffabce9826506913887be1fc33e1a96f66 (diff) | |
Merge pull request #207315 from Artturin/fixcrossevalissues1
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/beam-modules/lib.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/63.nix | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 068e1da33133..86f7d94eed1b 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,6 +1,7 @@ -{ lib, pkgs, erlang }: +{ lib, __splicedPackages, erlang }: let + pkgs = __splicedPackages; inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 1b021cf93472..2d93b28cda6b 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,5 +1,8 @@ -{ pkgs, lib }: +{ __splicedPackages, lib }: +let + pkgs = __splicedPackages; +in rec { /* Similar to callPackageWith/callPackage, but without makeOverridable diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 07684d8db818..19838763f5b4 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: import ./base.nix { version = "63.1"; @@ -11,4 +11,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } |