diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-06-11 15:41:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-11 15:41:19 +0000 |
| commit | aceeceaf5bc9877547f0f7d718100ca674a2a84b (patch) | |
| tree | 77ab979a178e70dcfc97ed3e509c471a3c432597 | |
| parent | 3d318cb303f285d2964d4137619cb21ddd56cfd5 (diff) | |
| parent | bb6069ec20918fea1521bfb225d90e03d03ecee3 (diff) | |
Merge pull request #237102 from amjoseph-nixpkgs/pr/dtc/fix-overrides
dtc: fix overrides: use finalAttrs, not rec
| -rw-r--r-- | pkgs/development/compilers/dtc/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 44d98d8e36bd9..5ec3d6ec36cc0 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -14,13 +14,13 @@ , libyaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dtc"; version = "1.7.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }) ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ meson @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { # meson.build: bump version to 1.7.0 substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${version}'," + --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${version}'," + --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," ''; # Required for installation of Python library and is innocuous otherwise. @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mesonAutoFeatures = "auto"; mesonFlags = [ (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) - (lib.mesonBool "tests" doCheck) + (lib.mesonBool "tests" finalAttrs.doCheck) ]; # Checks are broken on aarch64 darwin @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; }; -} +}) |