diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix index 1df3c3fb8f06..185f845776c9 100644 --- a/pkgs/by-name/os/oscar/package.nix +++ b/pkgs/by-name/os/oscar/package.nix @@ -1,41 +1,47 @@ { lib, stdenv, - qt5, + qt6, fetchFromGitLab, libGLU, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "oscar"; - version = "1.7.1"; + version = "2.0.1"; src = fetchFromGitLab { owner = "CrimsonNape"; - repo = "OSCAR-code"; + repo = "oscar-sql"; rev = "v${finalAttrs.version}"; - hash = "sha256-cOhbWihTHGkBxiMGZhBZ3ejo8kOxlWDctun3Mz5h7AQ="; + hash = "sha256-ivOEAP7/pc5yS6mhc/6ButbSjfFmOP4PM7c/S23oyYw="; }; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtserialport + qt6.qtbase + qt6.qttools libGLU ]; nativeBuildInputs = [ - qt5.wrapQtAppsHook - qt5.qmake + qt6.wrapQtAppsHook + qt6.qmake + qt6.qtserialport ]; + + strictDeps = true; + __structuredAttrs = true; + postPatch = '' - substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" + substituteInPlace oscar/oscar.pro \ + --replace-fail "/bin/bash" "${stdenv.shell}" \ + --replace-fail "\$\$[QT_INSTALL_BINS]/lrelease" "${qt6.qttools}/bin/lrelease" ''; qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' runHook preInstall - install -D oscar/OSCAR -t $out/bin + install -D oscar/OSCAR20 -t $out/bin # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 # install -D oscar/Help/* -t $out/share/OSCAR/Help install -D oscar/Html/* -t $out/share/OSCAR/Html