From cacbbe92bf7c1060279c94c6c78c0ef7e5eece48 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Tue, 31 Mar 2020 19:58:59 -0700 Subject: [PATCH 1/2] gwyddion: add darwin support Gwyddion will build on Darwin, but gnome2.gtkglext is broken there, and so I am disabling it as an optional dependency here when building on Darwin. --- pkgs/applications/science/chemistry/gwyddion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index cd8b93c9aac..644f609ed0a 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -12,7 +12,7 @@ zlibSupport ? true, zlib ? null, libuniqueSupport ? true, libunique ? null, libpngSupport ? true, libpng ? null, - openglSupport ? true + openglSupport ? !stdenv.isDarwin }: assert openexrSupport -> openexr != null; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ gtk2 fftw ] ++ - optionals openglSupport [gnome2.gtkglext] ++ + optional openglSupport gnome2.gtkglext ++ optional openexrSupport openexr ++ optional libXmuSupport xorg.libXmu ++ optional fitsSupport cfitsio ++ @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { spectrophotometry. ''; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = [ stdenv.lib.maintainers.cge ]; }; } From 45c9ad32fdea5cb46a62742ef317e1b3dfb43880 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Wed, 1 Apr 2020 17:47:55 -0700 Subject: [PATCH 2/2] libunique: add darwin libunique builds, and dependencies appear to build and run correctly, in OS X. --- pkgs/development/libraries/libunique/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index d6566978a6b..502fd27ebb6 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; }