diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/libfive | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/libfive')
| -rw-r--r-- | pkgs/development/libraries/libfive/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 2670f94fbc2..3833a7fe880 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -4,12 +4,13 @@ , fetchFromGitHub , cmake , ninja -, pkgconfig +, pkg-config , eigen , zlib , libpng , boost , guile +, stdenv }: mkDerivation { @@ -23,11 +24,22 @@ mkDerivation { sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; - # Link "Studio" binary to "libfive-studio" to be more obvious: - postFixup = '' + postInstall = if stdenv.isDarwin then '' + # No rules to install the mac app, so do it manually. + mkdir -p $out/Applications + cp -r studio/Studio.app $out/Applications/Studio.app + + install_name_tool \ + -change libfive.dylib $out/lib/libfive.dylib \ + -change libfive-guile.dylib $out/lib/libfive-guile.dylib \ + $out/Applications/Studio.app/Contents/MacOS/Studio + + wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio + '' else '' + # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; |