tjh.dev
Merge pull request #237102 from amjoseph-nixpkgs/pr/dtc/fix-overrides
dtc: fix overrides: use finalAttrs, not rec
authored by Thiago Kenji Okada and committed by GitHub aceeceaf 3d318cb3
+7
-7
pkgs/development/compilers/dtc/default.nix
+7
-7
pkgs/development/compilers/dtc/default.nix
···
14
14
, libyaml
15
15
}:
16
16
17
-
stdenv.mkDerivation rec {
17
+
stdenv.mkDerivation (finalAttrs: {
18
18
pname = "dtc";
19
19
version = "1.7.0";
20
20
21
21
src = fetchgit {
22
22
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
23
-
rev = "refs/tags/v${version}";
23
+
rev = "refs/tags/v${finalAttrs.version}";
24
24
sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc=";
25
25
};
26
26
···
50
50
})
51
51
];
52
52
53
-
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
53
+
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
54
54
55
55
nativeBuildInputs = [
56
56
meson
···
72
72
73
73
# meson.build: bump version to 1.7.0
74
74
substituteInPlace libfdt/meson.build \
75
-
--replace "version: '1.6.0'," "version: '${version}',"
75
+
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
76
76
substituteInPlace meson.build \
77
-
--replace "version: '1.6.0'," "version: '${version}',"
77
+
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
78
78
'';
79
79
80
80
# Required for installation of Python library and is innocuous otherwise.
···
83
83
mesonAutoFeatures = "auto";
84
84
mesonFlags = [
85
85
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
86
-
(lib.mesonBool "tests" doCheck)
86
+
(lib.mesonBool "tests" finalAttrs.doCheck)
87
87
];
88
88
89
89
# Checks are broken on aarch64 darwin
···
97
97
maintainers = [ maintainers.dezgeg ];
98
98
platforms = platforms.unix;
99
99
};
100
-
}
100
+
})