diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/xylib | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xylib')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xylib/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xylib/default.nix b/nixpkgs/pkgs/development/libraries/xylib/default.nix index f7d7eed7e70e..ab2e3792eeab 100644 --- a/nixpkgs/pkgs/development/libraries/xylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/xylib/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: +{ lib +, stdenv +, fetchurl +, boost +, zlib +, bzip2 +, wxGTK32 +}: stdenv.mkDerivation rec { pname = "xylib"; @@ -9,12 +16,17 @@ stdenv.mkDerivation rec { sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn"; }; - buildInputs = [ boost zlib bzip2 wxGTK30 ]; + buildInputs = [ + boost + zlib + bzip2 + wxGTK32 + ]; meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; - homepage = "http://xylib.sourceforge.net/"; + homepage = "https://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; |