Revert "Seeing if this fixes my ability to load Hedon."

This reverts commit de4d8904a7.
main
Jacob Sowder 7 months ago
parent a3aedbe4fb
commit f54dc0e5de

@ -60,7 +60,7 @@
(define-public my-gzdoom
(package
(name "gzdoom")
(version "4.13.2")
(version "4.10.0")
(source
(origin
(method git-fetch)
@ -75,47 +75,47 @@
;; ))
(modules '((guix build utils)
(ice-9 regex)))
;; (snippet
;; '(begin
;; ;; remove files which mustn't be commercially redistributed. see
;; ;; <https://zdoom.org/wiki/license#commercial_use>, the contribution
;; ;; guidelines at <https://github.com/zdoom>, and guix issue #73435.
;; (for-each
;; (lambda (directory)
;; (delete-file-recursively directory)
;; (substitute* "CMakeLists.txt"
;; (((string-append "add_subdirectory\\([[:blank:]]*"
;; directory
;; "[[:blank:]]*\\)"))
;; "")))
;; '( ;; "wadsrc_extra" ;game_support.pk3
;; "wadsrc_bm")) ;brightmaps.pk3
(snippet
'(begin
;; remove files which mustn't be commercially redistributed. see
;; <https://zdoom.org/wiki/license#commercial_use>, the contribution
;; guidelines at <https://github.com/zdoom>, and guix issue #73435.
(for-each
(lambda (directory)
(delete-file-recursively directory)
(substitute* "CMakeLists.txt"
(((string-append "add_subdirectory\\([[:blank:]]*"
directory
"[[:blank:]]*\\)"))
"")))
'( "wadsrc_extra" ;game_support.pk3
"wadsrc_bm")) ;brightmaps.pk3
;; ;; removing game_support.pk3 entirely would break freedoom & remove
;; ;; users' ability to play commercial games, despite owning (only) the
;; ;; non-functional data. that can't be right. out of an abundance of
;; ;; caution, remove anything from the pk3 that could conceivably be
;; ;; derived from copyrightable data that's not freely redistributable.
;; ;; (display "keeping only the following game_support.pk3 files:\n")
;; ;; (let* ((regexps (list "/font\\.inf$"
;; ;; "/harmony/.*\\.(txt|zs)$"
;; ;; "/(iwadinfo|mapinfo|sprofs)\\.txt$"
;; ;; "\\.z$"))
;; ;; (regexp* (format #f "(~{~a~^|~})" regexps))
;; ;; (regexp (make-regexp regexp* regexp/icase)))
;; ;; (define (keep-file? file stat)
;; ;; (let ((keep? (regexp-exec regexp file)))
;; ;; (when keep?
;; ;; (format #t " ~a~%" file))
;; ;; keep?))
;; removing game_support.pk3 entirely would break freedoom & remove
;; users' ability to play commercial games, despite owning (only) the
;; non-functional data. that can't be right. out of an abundance of
;; caution, remove anything from the pk3 that could conceivably be
;; derived from copyrightable data that's not freely redistributable.
(display "keeping only the following game_support.pk3 files:\n")
(let* ((regexps (list "/font\\.inf$"
"/harmony/.*\\.(txt|zs)$"
"/(iwadinfo|mapinfo|sprofs)\\.txt$"
"\\.z$"))
(regexp* (format #f "(~{~a~^|~})" regexps))
(regexp (make-regexp regexp* regexp/icase)))
(define (keep-file? file stat)
(let ((keep? (regexp-exec regexp file)))
(when keep?
(format #t " ~a~%" file))
keep?))
;; ;; (for-each delete-file (find-files "wadsrc_extra/static"
;; ;; (negate keep-file?))))
;; ;; remove some bundled libraries. xxx there are more, but removing
;; ;; them would require, at least, patching the build system.
;; (with-directory-excursion "libraries"
;; (delete-file-recursively "bzip2")
;; )))
(for-each delete-file (find-files "wadsrc_extra/static"
(negate keep-file?))))
;; remove some bundled libraries. xxx there are more, but removing
;; them would require, at least, patching the build system.
(with-directory-excursion "libraries"
(delete-file-recursively "bzip2"))))
))
(arguments
(list

Loading…
Cancel
Save