diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-11-06 00:38:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 00:38:38 +0100 |
| commit | f48ecbf85086f8c0a11c1bea4b8ec542229a73cc (patch) | |
| tree | e91a7de8063983f8e4fcb97f697ec7a3d2429d30 /pkgs | |
| parent | ca76550c9858eb60e82d0d573528448b3779490a (diff) | |
| parent | f2860971a2722eb31faf35c352fd3a7f1d9c66fb (diff) | |
| download | nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar.gz nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar.bz2 nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar.lz nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar.xz nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.tar.zst nixpkgs-f48ecbf85086f8c0a11c1bea4b8ec542229a73cc.zip | |
Merge pull request #72624 from witkamp/master
muparser: add darwin support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/muparser/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index d058322660c..4d3fe41dff8 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, setfile}: stdenv.mkDerivation rec { pname = "muparser"; @@ -10,12 +10,14 @@ stdenv.mkDerivation rec { sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z"; }; - buildInputs = [ unzip ]; + buildInputs = [ + unzip + ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile]; meta = { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 880c70ed230..dac44caf04c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12989,7 +12989,9 @@ in mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { }; + muparser = callPackage ../development/libraries/muparser { + inherit (darwin.stubs) setfile; + }; mutest = callPackage ../development/libraries/mutest { }; |