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

Merge pull request #83914 from cgevans/gwyddion-darwin

Browse Source 
gwyddion: support darwin
This commit is contained in:
Dmitry Kalinkin 2020-04-01 21:44:21 -04:00 committed by GitHub
commit 99a236b477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/chemistry/gwyddion/default.nix
View File

@ -12,7 +12,7 @@
zlibSupport ? true, zlib ? null, zlibSupport ? true, zlib ? null,
libuniqueSupport ? true, libunique ? null, libuniqueSupport ? true, libunique ? null,
libpngSupport ? true, libpng ? null, libpngSupport ? true, libpng ? null,
openglSupport ? true openglSupport ? !stdenv.isDarwin
}: }:
assert openexrSupport -> openexr != null; assert openexrSupport -> openexr != null;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ gtk2 fftw ] ++ [ gtk2 fftw ] ++
optionals openglSupport [gnome2.gtkglext] ++ optional openglSupport gnome2.gtkglext ++
optional openexrSupport openexr ++ optional openexrSupport openexr ++
optional libXmuSupport xorg.libXmu ++ optional libXmuSupport xorg.libXmu ++
optional fitsSupport cfitsio ++ optional fitsSupport cfitsio ++
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
spectrophotometry. spectrophotometry.
''; '';
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = [ stdenv.lib.maintainers.cge ]; maintainers = [ stdenv.lib.maintainers.cge ];
}; };
} }

2
pkgs/development/libraries/libunique/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Attic/LibUnique"; homepage = "https://wiki.gnome.org/Attic/LibUnique";
description = "A library for writing single instance applications"; description = "A library for writing single instance applications";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
}; };
} }