nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #168969 from SuperSandro2000/staging-next-sandro

Browse Source 
Staging next fixes
This commit is contained in:
Sandro 2022-04-17 00:35:09 +02:00 committed by GitHub
commit f37f0ad4e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/logic/fast-downward/default.nix
View File

@ -7,22 +7,21 @@
, cplex
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "fast-downward";
version = "21.12.0";
src = fetchFromGitHub {
owner = "aibasel";
repo = "downward";
rev = "release-21.12.0";
rev = "release-${version}";
sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ python3 python3.pkgs.wrapPython osi ];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
buildInputs = [ python3 osi ];
cmakeFlags =
lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];
cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];
configurePhase = ''
python build.py release
@ -62,7 +61,7 @@ stdenv.mkDerivation {
description = "A domain-independent planning system";
homepage = "https://www.fast-downward.org/";
license = licenses.gpl3Plus;
platforms = with platforms; (linux ++ darwin);
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}

2
pkgs/development/python-modules/symengine/default.nix
View File

@ -30,7 +30,7 @@ buildPythonPackage rec {
})
];
postConfigure = ''
postPatch = ''
substituteInPlace setup.py \
--replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \
--replace "'cython>=0.29.24'" "'cython'"