From b4782435b2d2afc56089bd57ad85517c196d2097 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 15 Feb 2025 18:04:43 -0300 Subject: [PATCH] gnu: gmic: Set CMAKE_EXE_LINKER_FLAGS. * gnu/packages/image-processing.scm (gmic)<#:configure-flags>: Pass "-DCMAKE_EXE_LINKER_FLAGS". <#:phases>: Delete the 'set-LDFLAGS phase. (gmic-qt, gmic-qt-gimp)[arguments]<#:configure-flags>: Delete "-DGMIC_LIB_PATH". Change-Id: If4f76263ca9bbadd4a67a6c2ec91839d60fa0bd2 --- gnu/packages/image-processing.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 04f8bea8dabcb633562a53b728c350757e8001d9..d8884b5bf61ae10abf0f0e3db32ab1c6a90730da 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -843,15 +843,9 @@ due to its architecture which automatically parallelises the image workflows.") #:tests? #f ;there are no tests #:configure-flags #~(list "-DBUILD_LIB_STATIC=OFF" "-DENABLE_DYNAMIC_LINKING=ON" - "-DENABLE_LTO=ON") - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'set-LDFLAGS - (lambda _ - (setenv "LDFLAGS" - (string-append - "-Wl,-rpath=" - #$output "/lib"))))))) + (string-append "-DCMAKE_EXE_LINKER_FLAGS=" + "-Wl,-rpath=" #$output "/lib") + "-DENABLE_LTO=ON"))) (native-inputs (list pkg-config)) (inputs @@ -883,13 +877,11 @@ including 2D color images.") (substitute-keyword-arguments (package-arguments gmic) ((#:configure-flags _) #~(list "-DGMIC_QT_HOST=none" - "-DENABLE_DYNAMIC_LINKING=ON" - (string-append "-DGMIC_LIB_PATH=" - #$(this-package-input "gmic") "/lib"))) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'unpack 'qt-chdir - (lambda _ (chdir "gmic-qt") #t)))))) + "-DENABLE_DYNAMIC_LINKING=ON")) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'qt-chdir + (lambda _ (chdir "gmic-qt"))))))) (native-inputs (list pkg-config qttools-5)) (inputs @@ -910,9 +902,7 @@ including 2D color images.") (substitute-keyword-arguments (package-arguments gmic-qt) ((#:configure-flags flags) #~(list "-DGMIC_QT_HOST=gimp" - "-DENABLE_DYNAMIC_LINKING=ON" - (string-append "-DGMIC_LIB_PATH=" - #$(this-package-input "gmic") "/lib"))))) + "-DENABLE_DYNAMIC_LINKING=ON")))) (synopsis "GIMP plugin for the G'MIC image processing framework"))) (define-public nip2