forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sbclPackages: fix build of qt, qt-libs and qtools
- Loading branch information
1 parent
fd3646f
commit 422f1c2
Showing
3 changed files
with
146 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
--- a/qt-libs.asd | ||
+++ b/qt-libs.asd | ||
@@ -17,5 +17,4 @@ | ||
:components ((:file "qt-libs")) | ||
:depends-on (:qt-lib-generator | ||
:cl-ppcre | ||
- :cffi) | ||
- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs))) | ||
+ :cffi)) | ||
--- a/qt-libs.lisp | ||
+++ b/qt-libs.lisp | ||
@@ -94,16 +94,14 @@ | ||
standalone-dir) | ||
|
||
(defun %ensure-lib-loaded (file) | ||
- (let ((file (etypecase file | ||
- (pathname file) | ||
- (string (installed-library-file file)))) | ||
- (name (intern (string-upcase (pathname-name file)))) | ||
- #+sbcl(sb-ext:*muffled-warnings* 'style-warning)) | ||
- (cffi::register-foreign-library | ||
- name `((T ,file)) | ||
- :search-path (to-directory file)) | ||
- (unless (cffi:foreign-library-loaded-p name) | ||
- (cffi:load-foreign-library name)))) | ||
+ (let ((name (make-pathname :name (format nil "lib~a" file) | ||
+ :type #+unix "so" | ||
+ #+darwin "dylib"))) | ||
+ (or (find-if (lambda (lib) | ||
+ (equal (cffi:foreign-library-pathname lib) | ||
+ (namestring name))) | ||
+ (cffi:list-foreign-libraries)) | ||
+ (cffi:load-foreign-library name)))) | ||
|
||
(defun ensure-lib-loaded (file) | ||
(cond ((pathnamep file) |
19 changes: 19 additions & 0 deletions
19
pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Dont use the qt+libs system for managing Qt dependencies, because Nix provides | ||
them already. | ||
Don't build the deploy.lisp helper file, because Nix also can handle deployment. | ||
--- a/qtools.asd | ||
+++ b/qtools.asd | ||
@@ -33,10 +33,9 @@ | ||
(:file "generate") | ||
(:file "dynamic") | ||
(:file "precompile") | ||
- (:file "deploy") | ||
(:file "fast-call") | ||
(:file "documentation")) | ||
- :depends-on (:qt+libs | ||
+ :depends-on (:qt | ||
:deploy | ||
:cl-ppcre | ||
:closer-mop | ||
|
||
Diff finished. Sun Oct 2 14:38:06 2022 |