amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mkvtoolnix: Remove input labels and use gexps.

Browse source 
* gnu/packages/video.scm (mkvtoolnix)[native-inputs]: Remove labels.
[arguments]: Use gexps and ‘this-package-input’ & co.

Change-Id: I12b6638cd78c8c957ac9856c0e19025f4941847e
This commit is contained in:
Ludovic Courtès 2024-01-07 16:27:09 +01:00
parent 5d97fdb608
commit 5f8a993aa8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 83 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

77
gnu/packages/video.scm
View file

@ -1090,28 +1090,30 @@ H.264 (MPEG-4 AVC) video streams.")
utfcpp utfcpp
zlib)) zlib))
(native-inputs (native-inputs
`(("docbook-xsl" ,docbook-xsl) (list docbook-xsl
("gettext" ,gettext-minimal) gettext-minimal
("googletest" ,googletest) googletest
("libxslt" ,libxslt) libxslt
("nlohmann-json" ,nlohmann-json) nlohmann-json
("perl" ,perl) perl
("pkg-config" ,pkg-config) pkg-config
("po4a" ,po4a) po4a
("qttools" ,qttools) qttools
("ruby" ,ruby-3.2))) ruby-3.2))
(arguments (arguments
`(#:configure-flags (list
(list (string-append "--with-boost=" #:configure-flags
(assoc-ref %build-inputs "boost")) #~(list (string-append "--with-boost="
#$(this-package-input "boost"))
(string-append "--with-docbook-xsl-root=" (string-append "--with-docbook-xsl-root="
(assoc-ref %build-inputs "docbook-xsl") #$(this-package-native-input "docbook-xsl")
"/xml/xsl/docbook-xsl-" "/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)) #$(package-version
(this-package-native-input "docbook-xsl")))
"--enable-update-check=no" "--enable-update-check=no"
"--enable-precompiled-headers=no") "--enable-precompiled-headers=no")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-utfcpp-include (add-after 'unpack 'fix-utfcpp-include
(lambda _ (lambda _
(substitute* "src/common/strings/utf8.cpp" (substitute* "src/common/strings/utf8.cpp"
@ -1122,15 +1124,16 @@ H.264 (MPEG-4 AVC) video streams.")
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "src/mkvtoolnix-gui/util/settings.cpp" (substitute* "src/mkvtoolnix-gui/util/settings.cpp"
(("mkvmerge" match) (("mkvmerge" match)
(string-append out "/bin/" match))) (string-append out "/bin/" match))) #t)))
#t)))
(add-before 'configure 'add-googletest (add-before 'configure 'add-googletest
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(symlink (search-input-directory inputs "/include/gtest") (symlink (search-input-directory inputs
"/include/gtest")
"lib/gtest"))) "lib/gtest")))
(replace 'build (replace 'build
(lambda _ (lambda _
(let ((-j (list "-j" (number->string (parallel-job-count))))) (let ((-j (list "-j"
(number->string (parallel-job-count)))))
(apply invoke "rake" -j)))) (apply invoke "rake" -j))))
(replace 'check (replace 'check
(lambda _ (lambda _
@ -1144,27 +1147,33 @@ H.264 (MPEG-4 AVC) video streams.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(gui (assoc-ref outputs "gui")) (gui (assoc-ref outputs "gui"))
(strip-store-dir (lambda (path) (strip-store-dir (lambda (path)
(substring path (string-prefix-length out path))))) (substring path
(for-each (string-prefix-length
(lambda (file) out path)))))
(mkdir-p (string-append gui (dirname file))) (for-each (lambda (file)
(mkdir-p (string-append gui
(dirname
file)))
(rename-file (string-append out file) (rename-file (string-append out file)
(string-append gui file))) (string-append gui file)))
(append '("/bin/mkvtoolnix-gui" (append '("/bin/mkvtoolnix-gui"
"/share/applications/org.bunkus.mkvtoolnix-gui.desktop" "/share/applications/org.bunkus.mkvtoolnix-gui.desktop"
"/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml" "/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml"
"/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml") "/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml")
(map strip-store-dir (find-files out "\\.ogg$")) (map strip-store-dir
(map strip-store-dir (find-files out "mkvtoolnix-gui\\.png$")) (find-files out "\\.ogg$"))
(map strip-store-dir (find-files out "mkvtoolnix-gui\\.1")))) (map strip-store-dir
(for-each (find-files out
(lambda (file) "mkvtoolnix-gui\\.png$"))
(delete-file-recursively (string-append out file))) (map strip-store-dir
(find-files out
"mkvtoolnix-gui\\.1"))))
(for-each (lambda (file)
(delete-file-recursively
(string-append out file)))
'("/share/applications" '("/share/applications"
"/share/metainfo" "/share/metainfo" "/share/mime"
"/share/mime" "/share/mkvtoolnix"))))))))
"/share/mkvtoolnix")))
#t)))))
(home-page "https://mkvtoolnix.download") (home-page "https://mkvtoolnix.download")
(synopsis "Tools to create, alter and inspect Matroska files") (synopsis "Tools to create, alter and inspect Matroska files")
(description (description