minizinc: fix build inputs, format

3 files changed, 18 insertions, 13 deletions

diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index d62bdee040695..40bc816e31443 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -1,10 +1,9 @@
 { lib, stdenv, fetchFromGitHub, callPackage, jq, cmake, flex, bison, gecode, mpfr, cbc, zlib }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizinc";
   version = "2.7.4";
 
-  nativeBuildInputs = [ cmake flex bison gecode mpfr cbc zlib ];
-
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "libminizinc";
@@ -12,9 +11,13 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-Zq5gAwe9IQmknSDilFyHhSk5ZCQ8EfBOiM6Oef2WxYg=";
   };
 
+  nativeBuildInputs = [ bison cmake flex jq ];
+
+  buildInputs = [ gecode mpfr cbc zlib ];
+
   postInstall = ''
     mkdir -p $out/share/minizinc/solvers/
-    ${jq}/bin/jq \
+    jq \
       '.version = "${gecode.version}"
        | .mznlib = "${gecode}/share/gecode/mznlib"
        | .executable = "${gecode}/bin/fzn-gecode"' \
@@ -29,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "A medium-level constraint modelling language";
-
     longDescription = ''
       MiniZinc is a medium-level constraint modelling
       language. It is high-level enough to express most
@@ -37,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
       that it can be mapped onto existing solvers easily and consistently.
       It is a subset of the higher-level language Zinc.
     '';
-
     license = licenses.mpl20;
     platforms = platforms.unix;
     maintainers = [ maintainers.sheenobu ];
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 8c2756f801eef..f89f067d20385 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -1,11 +1,9 @@
 { lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
+
 mkDerivation rec {
   pname = "minizinc-ide";
   version = "2.5.5";
 
-  nativeBuildInputs = [ qmake ];
-  buildInputs = [ qtbase qtwebengine qtwebkit ];
-
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
@@ -14,6 +12,9 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtbase qtwebengine qtwebkit ];
+
   sourceRoot = "source/MiniZincIDE";
 
   dontWrapQtApps = true;
@@ -25,7 +26,6 @@ mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "IDE for MiniZinc, a medium-level constraint modelling language";
-
     longDescription = ''
       MiniZinc is a medium-level constraint modelling
       language. It is high-level enough to express most
@@ -33,7 +33,6 @@ mkDerivation rec {
       that it can be mapped onto existing solvers easily and consistently.
       It is a subset of the higher-level language Zinc.
     '';
-
     license = licenses.mpl20;
     platforms = platforms.linux;
     maintainers = [ maintainers.dtzWill ];
diff --git a/pkgs/development/tools/minizinc/simple-test/default.nix b/pkgs/development/tools/minizinc/simple-test/default.nix
index 0a9a811a43fff..ee813e09cf00a 100644
--- a/pkgs/development/tools/minizinc/simple-test/default.nix
+++ b/pkgs/development/tools/minizinc/simple-test/default.nix
@@ -6,11 +6,16 @@
 
 stdenv.mkDerivation {
   name = "minizinc-simple-test";
-  meta.timeout = 10;
+
+  nativeBuildInputs = [ minizinc ];
+
   dontInstall = true;
+
   buildCommand = ''
-    ${minizinc}/bin/minizinc --solver gecode ${./aust.mzn}
-    ${minizinc}/bin/minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
+    minizinc --solver gecode ${./aust.mzn}
+    minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
     touch $out
   '';
+
+  meta.timeout = 10;
 }