gnu: cdparanoia: Don't use patchelf.
* gnu/packages/cdrom.scm (cdparanoia): Remove 'patchelf' from inputs. [arguments]: Remove #:modules, #:imported-modules and #:phases. Pass 'LDFLAGS=-Wl,-rpath=...' as #:configure-flags. [origin]: Add 'snippet'.
This commit is contained in:
		
							parent
							
								
									be84118181
								
							
						
					
					
						commit
						d1f9e45e5d
					
				
					 1 changed files with 8 additions and 20 deletions
				
			
		| 
						 | 
					@ -159,29 +159,17 @@ files.")
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"))
 | 
					               "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"))
 | 
				
			||||||
             (patches (list (search-patch "cdparanoia-fpic.patch")))))
 | 
					             (patches (list (search-patch "cdparanoia-fpic.patch")))
 | 
				
			||||||
 | 
					             (modules '((guix build utils)))
 | 
				
			||||||
 | 
					             (snippet
 | 
				
			||||||
 | 
					              ;; Make libraries respect LDFLAGS.
 | 
				
			||||||
 | 
					              '(substitute* '("paranoia/Makefile.in" "interface/Makefile.in")
 | 
				
			||||||
 | 
					                 (("-Wl,-soname") "$(LDFLAGS) -Wl,-soname")))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs
 | 
					 | 
				
			||||||
     `(("patchelf" ,patchelf)))
 | 
					 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f ; there is no check target
 | 
					     `(#:tests? #f ; there is no check target
 | 
				
			||||||
       #:modules ((guix build gnu-build-system)
 | 
					       #:configure-flags ; Add $libdir to the RUNPATH of all the executables.
 | 
				
			||||||
                  (guix build utils)
 | 
					       (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))))
 | 
				
			||||||
                  (guix build rpath)
 | 
					 | 
				
			||||||
                  (srfi srfi-26))
 | 
					 | 
				
			||||||
       #:imported-modules (,@%gnu-build-system-modules
 | 
					 | 
				
			||||||
                           (guix build rpath))
 | 
					 | 
				
			||||||
       #:phases
 | 
					 | 
				
			||||||
        (alist-cons-after
 | 
					 | 
				
			||||||
         'strip 'add-lib-to-runpath
 | 
					 | 
				
			||||||
         (lambda* (#:key outputs #:allow-other-keys)
 | 
					 | 
				
			||||||
           (let* ((out (assoc-ref outputs "out"))
 | 
					 | 
				
			||||||
                  (lib (string-append out "/lib")))
 | 
					 | 
				
			||||||
             ;; Add LIB to the RUNPATH of all the executables.
 | 
					 | 
				
			||||||
             (with-directory-excursion out
 | 
					 | 
				
			||||||
               (for-each (cut augment-rpath <> lib)
 | 
					 | 
				
			||||||
                         (find-files "bin" ".*")))))
 | 
					 | 
				
			||||||
         %standard-phases)))
 | 
					 | 
				
			||||||
    (home-page "http://www.xiph.org/paranoia/")
 | 
					    (home-page "http://www.xiph.org/paranoia/")
 | 
				
			||||||
    (synopsis "Audio CD reading utility")
 | 
					    (synopsis "Audio CD reading utility")
 | 
				
			||||||
    (description "Cdparanoia retrieves audio tracks from CDDA capable CDROM
 | 
					    (description "Cdparanoia retrieves audio tracks from CDDA capable CDROM
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue