tulip: migrate to by-name (#510099)
This commit is contained in:
+7
-5
@@ -7,14 +7,16 @@
|
||||
libGLU,
|
||||
libGL,
|
||||
glew,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
qt5,
|
||||
autoPatchelfHook,
|
||||
python3,
|
||||
python312,
|
||||
cmake,
|
||||
libjpeg,
|
||||
llvmPackages,
|
||||
}:
|
||||
let
|
||||
python3 = python312; # fails to build otherwise
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tulip";
|
||||
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
freetype
|
||||
glew
|
||||
libjpeg
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
|
||||
@@ -11247,10 +11247,6 @@ with pkgs;
|
||||
|
||||
spyder = with python3.pkgs; toPythonApplication spyder;
|
||||
|
||||
tulip = libsForQt5.callPackage ../applications/science/misc/tulip {
|
||||
python3 = python312; # fails to build otherwise
|
||||
};
|
||||
|
||||
### SCIENCE / PHYSICS
|
||||
|
||||
hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
|
||||
|
||||
Reference in New Issue
Block a user