colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minizincide: 2.5.5 -> 2.8.2

Browse Source
This commit is contained in:
Jip J. Dekker 2024-01-31 11:17:50 +11:00
parent ba5f81a6b6
commit b2c07d4a34
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/tools/minizinc/ide.nix
View File

@ -1,26 +1,34 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
{ lib, stdenv, fetchFromGitHub, qtbase, qmake, qtwebsockets, minizinc, makeWrapper, Cocoa }:
mkDerivation rec {
let
executableLoc = if stdenv.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE";
in
stdenv.mkDerivation rec {
pname = "minizinc-ide";
version = "2.5.5";
version = "2.8.2";
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
sha256 = "sha256-0U3KFRDam8psbCaEOcrwqzICAy1oBgo8SFEiR/PMqZk=";
hash = "sha256-3L/hulNI7e2wE9gMt2h3mS0ubHZ4kcVpwALCmWQtv7A=";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ];
nativeBuildInputs = [ qmake makeWrapper ];
buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
sourceRoot = "${src.name}/MiniZincIDE";
dontWrapQtApps = true;
postInstall = ''
wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]}
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
mv $out/bin/MiniZincIDE.app $out/Applications/
'' + ''
wrapProgram ${executableLoc} \
--prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \
--set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms"
'';
meta = with lib; {
@ -34,7 +42,7 @@ mkDerivation rec {
It is a subset of the higher-level language Zinc.
'';
license = licenses.mpl20;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.dtzWill ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -19574,7 +19574,9 @@ with pkgs;
minify = callPackage ../development/web/minify { };
minizinc = callPackage ../development/tools/minizinc { };
minizincide = libsForQt5.callPackage ../development/tools/minizinc/ide.nix { };
minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
};
mkcert = callPackage ../development/tools/misc/mkcert { };