Merge pull request #201259 from trofi/libstroke-without-xlibsWrapper

libstroke: use xorg.* packages directly instead of xlibsWrapper indir…
2022-11-16 07:41:04 +00:00
parent ddf9f4171e 065e85e8ad
commit 85bcde8fb6
1 changed files with 8 additions and 2 deletions
@@ -1,4 +1,10 @@
-{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
+{ lib
+, stdenv
+, fetchurl
+, automake
+, autoconf
+, libX11
+}:

 stdenv.mkDerivation rec {
  pname = "libstroke";
@@ -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.