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/lesstif | |
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/lesstif')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/lesstif/default.nix | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lesstif/default.nix b/nixpkgs/pkgs/development/libraries/lesstif/default.nix index dc0c8c0ed741..e0bd674e4daa 100644 --- a/nixpkgs/pkgs/development/libraries/lesstif/default.nix +++ b/nixpkgs/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,15 @@ -{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: +{ lib +, stdenv +, fetchurl +, freetype +, fontconfig +, libICE +, libX11 +, libXp +, libXau +, libXext +, libXt +}: stdenv.mkDerivation rec { pname = "lesstif"; @@ -7,8 +18,18 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; }; - buildInputs = [xlibsWrapper]; - propagatedBuildInputs = [libXp libXau]; + buildInputs = [ + freetype + fontconfig + libICE + libX11 + libXext + libXt + ]; + propagatedBuildInputs = [ + libXau + libXp + ]; # These patches fix a number of later issues - in particular the # render_table_crash shows up in 'arb'. The same patches appear @@ -22,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open source clone of the Motif widget set"; - homepage = "http://lesstif.sourceforge.net"; + homepage = "https://lesstif.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; |