golly: move to by-name
This commit is contained in:
+3
-3
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
wrapGAppsHook3,
|
||||
wxGTK,
|
||||
wxGTK32,
|
||||
python3,
|
||||
zlib,
|
||||
libGLU,
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
wxGTK
|
||||
wxGTK32
|
||||
python3
|
||||
zlib
|
||||
libGLU
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
"CXXC=${stdenv.cc.targetPrefix}c++"
|
||||
"LD=${stdenv.cc.targetPrefix}c++"
|
||||
"WX_CONFIG=${lib.getExe' (lib.getDev wxGTK) "wx-config"}"
|
||||
"WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -15260,10 +15260,6 @@ with pkgs;
|
||||
|
||||
gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
|
||||
|
||||
golly = callPackage ../applications/science/misc/golly {
|
||||
wxGTK = wxGTK32;
|
||||
};
|
||||
|
||||
megam = callPackage ../applications/science/misc/megam {
|
||||
inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user