diff options
| author | Jonas Meeuws <jonas.meeuws@gmail.com> | 2026-08-02 16:04:39 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-08-22 16:49:15 +0200 |
| commit | 694f320496da54073a14edd42edc5ec6c809495b (patch) | |
| tree | fada2bf25fe23d800539beb0baa4ebe000b216e5 /gnu/packages/dlang.scm | |
| parent | 8859b0caf6fcf6a42834890e31d9c13432f83ac5 (diff) | |
gnu: ldc: Inherit from local binding of ldc-bootstrap instead.
* gnu/packages/dlang.scm (ldc): Wrap in a let expression. Replace references
to ‘ldc-bootstrap’ with ‘base’.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/dlang.scm')
| -rw-r--r-- | gnu/packages/dlang.scm | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index b51afa781c0..bb548160438 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm | |||
| @@ -314,26 +314,29 @@ bootstrapping more recent compilers written in D.") | |||
| 314 | (hidden? . #t))))) | 314 | (hidden? . #t))))) |
| 315 | 315 | ||
| 316 | (define-public ldc | 316 | (define-public ldc |
| 317 | (package | 317 | (let ((base ldc-bootstrap)) |
| 318 | (inherit ldc-bootstrap) | 318 | (package |
| 319 | (arguments | 319 | (inherit base) |
| 320 | (substitute-keyword-arguments | 320 | (arguments |
| 321 | (strip-keyword-arguments '(#:tests?) (package-arguments ldc-bootstrap)) | 321 | (substitute-keyword-arguments |
| 322 | ((#:make-flags flags #f) | 322 | (strip-keyword-arguments |
| 323 | #~(append #$flags | 323 | '(#:tests?) |
| 324 | (list ;; Also build the test runner binaries. | 324 | (package-arguments base)) |
| 325 | "ldc2-unittest" "all-test-runners"))) | 325 | ((#:make-flags flags #f) |
| 326 | ((#:configure-flags flags #~'()) | 326 | #~(append #$flags |
| 327 | #~(append | 327 | (list ;; Also build the test runner binaries. |
| 328 | (fold delete #$flags '("-DD_COMPILER_FLAGS=-fPIC" | 328 | "ldc2-unittest" "all-test-runners"))) |
| 329 | "-DBUILD_SHARED_LIBS=OFF")) | 329 | ((#:configure-flags flags #~'()) |
| 330 | '("-DBUILD_SHARED_LIBS=ON"))))) | 330 | #~(append |
| 331 | (native-inputs | 331 | (fold delete #$flags '("-DD_COMPILER_FLAGS=-fPIC" |
| 332 | (modify-inputs (package-native-inputs ldc-bootstrap) | 332 | "-DBUILD_SHARED_LIBS=OFF")) |
| 333 | (delete "gdmd") | 333 | '("-DBUILD_SHARED_LIBS=ON"))))) |
| 334 | (append ldc-bootstrap))) | 334 | (native-inputs |
| 335 | (properties | 335 | (modify-inputs (package-native-inputs base) |
| 336 | (alist-delete 'hidden? (package-properties ldc-bootstrap))))) | 336 | (delete "gdmd") |
| 337 | (append base))) | ||
| 338 | (properties | ||
| 339 | (alist-delete 'hidden? (package-properties base)))))) | ||
| 337 | 340 | ||
| 338 | 341 | ||
| 339 | ;; Reference D compiler | 342 | ;; Reference D compiler |
