Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libstroke: use xorg.* packages directly instead of xlibsWrapper indir… #201259

Merged
merged 1 commit into from
Nov 16, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/development/libraries/libstroke/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
{ lib
, stdenv
, fetchurl
, automake
, autoconf
, libX11
}:

stdenv.mkDerivation rec {
pname = "libstroke";
Expand All @@ -10,7 +16,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ automake autoconf ];
buildInputs = [ xlibsWrapper ];
buildInputs = [ libX11 ];

# libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
# Also, modern automake doesn't like things and returns error code 63. But it generates the file.
Expand Down