Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sbclPackages: fix build of Qt4 binding libraries #195393

Merged
merged 3 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13980,6 +13980,12 @@
githubId = 928084;
name = "Utku Demir";
};
uthar = {
email = "galkowskikasper@gmail.com";
github = "uthar";
githubId = 15697697;
name = "Kasper Gałkowski";
};
uvnikita = {
email = "uv.nikita@gmail.com";
github = "uvNikita";
Expand Down
21 changes: 21 additions & 0 deletions pkgs/development/libraries/smokegen/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ pkgs, lib, ... }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's some issues in these 2 packages, i've fixed them in #205201


pkgs.stdenv.mkDerivation rec {
pname = "smokegen";
version = "v4.14.3";
src = pkgs.fetchzip {
url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c=";
};
buildInputs = [ pkgs.cmake pkgs.qt4 ];
buildPhase = ''
cmake .
'';
meta = with lib; {
description = "A general purpose C++ parser with a plugin infrastructure";
homepage = "https://invent.kde.org/unmaintained/smokegen";
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ uthar ];
};
}
21 changes: 21 additions & 0 deletions pkgs/development/libraries/smokeqt/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ pkgs, lib, ... }:

pkgs.stdenv.mkDerivation rec {
pname = "smokeqt";
version = "v4.14.3";
src = pkgs.fetchzip {
url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg=";
};
cmakeFlags = [
"-DCMAKE_CXX_STANDARD=98"
];
buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ];
meta = with lib; {
description = "Bindings for the Qt libraries";
homepage = "https://invent.kde.org/unmaintained/smokeqt";
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ uthar ];
};
}
91 changes: 91 additions & 0 deletions pkgs/development/lisp-modules-new/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ let
optionals
hasSuffix
splitString
remove
optionalString
stringLength
;

# Used by builds that would otherwise attempt to write into storeDir.
Expand Down Expand Up @@ -42,6 +45,11 @@ let
# Patches are already applied in `build`
patches = [];
src = build;
# TODO(kasper): handle this with a setup hook
LD_LIBRARY_PATH =
build.LD_LIBRARY_PATH
+ (optionalString (stringLength build.LD_LIBRARY_PATH != 0) ":")
+ "${build}";
});

# A little hacky
Expand Down Expand Up @@ -332,6 +340,89 @@ let
version = "f19162e76";
});

qt = let
rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e";
in build-with-compile-into-pwd rec {
pname = "commonqt";
version = builtins.substring 0 7 rev;

src = pkgs.fetchFromGitHub {
inherit rev;
owner = pname;
repo = pname;
hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug=";
};

buildInputs = [ pkgs.qt4 ];
nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ];
nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ];

systems = [ "qt" ];

lispLibs = with ql; [
cffi named-readtables cl-ppcre alexandria
closer-mop iterate trivial-garbage bordeaux-threads
];
};

qt-libs = build-with-compile-into-pwd {
inherit (ql.qt-libs) pname version src;
patches = [ ./patches/qt-libs-dont-download.patch ];
prePatch = ''
substituteInPlace systems/*.asd --replace ":qt+libs" ":qt"
echo "LD Path: $LD_LIBRARY_PATH"
'';
lispLibs = ql.qt-libs.lispLibs ++ [ qt ];
systems = [
"qt-libs"
"commonqt"
# "phonon"
# "qimageblitz"
# "qsci"
"qt3support"
"qtcore"
"qtdbus"
"qtdeclarative"
"qtgui"
"qthelp"
"qtnetwork"
"qtopengl"
"qtscript"
"qtsql"
"qtsvg"
"qttest"
"qtuitools"
# "qtwebkit"
"qtxml"
"qtxmlpatterns"
# "qwt"
"smokebase"
];
};
commonqt = qt-libs;
qt3support = qt-libs;
qtcore = qt-libs;
qtdbus = qt-libs;
qtdeclarative = qt-libs;
qtgui = qt-libs;
qthelp = qt-libs;
qtnetwork = qt-libs;
qtopengl = qt-libs;
qtscript = qt-libs;
qtsql = qt-libs;
qtsvg = qt-libs;
qttest = qt-libs;
qtuitools = qt-libs;
qtxml = qt-libs;
qtxmlpatterns = qt-libs;
smokebase = qt-libs;

qtools = build-with-compile-into-pwd {
inherit (ql.qtools) pname version src nativeLibs;
lispLibs = [ qt ] ++ remove ql.qt_plus_libs ql.qtools.lispLibs ++ [ qt-libs ];
patches = [ ./patches/qtools-use-nix-libs.patch ];
};

};

in packages
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)
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
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4733,6 +4733,10 @@ with pkgs;

simg2img = callPackage ../tools/filesystems/simg2img { };

smokegen = callPackage ../development/libraries/smokegen {};

smokeqt = callPackage ../development/libraries/smokeqt {};

snazy = callPackage ../development/tools/snazy { };

snippetpixie = callPackage ../tools/text/snippetpixie { };
Expand Down