dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

readstat, python3Packages.pyreadstat: fix build on Darwin

Browse Source
This commit is contained in:
Malo Bourgon 2022-10-21 11:18:30 -07:00
parent 71c5816834
commit 5e976f8f6d
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/readstat/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "readstat"; name = "readstat";
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ];
meta = { meta = {
homepage = "https://github.com/WizardMac/ReadStat"; homepage = "https://github.com/WizardMac/ReadStat";
description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files";

4
pkgs/development/python-modules/pyreadstat/default.nix
View File

@ -1,7 +1,9 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, cython , cython
, fetchFromGitHub , fetchFromGitHub
, libiconv
, pandas , pandas
, python , python
, pythonOlder , pythonOlder
@ -29,6 +31,8 @@ buildPythonPackage rec {
buildInputs = [ buildInputs = [
zlib zlib
] ++ lib.optionals stdenv.isDarwin [
libiconv
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -10744,7 +10744,9 @@ with pkgs;
read-edid = callPackage ../os-specific/linux/read-edid { }; read-edid = callPackage ../os-specific/linux/read-edid { };
readstat = callPackage ../applications/science/math/readstat { }; readstat = callPackage ../applications/science/math/readstat {
inherit (pkgs.darwin) libiconv;
};
redir = callPackage ../tools/networking/redir { }; redir = callPackage ../tools/networking/redir { };

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

@ -8493,7 +8493,9 @@ in {
pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { };
pyreadstat = callPackage ../development/python-modules/pyreadstat { }; pyreadstat = callPackage ../development/python-modules/pyreadstat {
inherit (pkgs.darwin) libiconv;
};
pyrealsense2 = toPythonModule (pkgs.librealsense.override { pyrealsense2 = toPythonModule (pkgs.librealsense.override {
enablePython = true; enablePython = true;