summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-10-29 09:13:14 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-10-29 12:11:27 +0200
commit75633a59b1d26d41fd306487548f00c6afbcc7a8 (patch)
treecc62cbb939c1ede24d7b41e54e7f368dcba01b9f
parentac36151fcbb8d28219a1262512c8d2d1529b59d5 (diff)
downloadnixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar.gz
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar.bz2
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar.lz
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar.xz
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.tar.zst
nixpkgs-75633a59b1d26d41fd306487548f00c6afbcc7a8.zip
xspim: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
-rw-r--r--pkgs/development/tools/misc/xspim/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix
index 6e11c81cbde..808e9f92da7 100644
--- a/pkgs/development/tools/misc/xspim/default.nix
+++ b/pkgs/development/tools/misc/xspim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, imake, bison, flex, xlibsWrapper, libXaw, libXpm, ... }:
+{ lib, stdenv, fetchsvn, imake, bison, flex, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "xspim";
@@ -11,7 +11,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ imake bison flex ];
-  buildInputs = [ xlibsWrapper libXaw libXpm ];
+  buildInputs = [
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXaw
+    xorg.libXext
+    xorg.libXmu
+    xorg.libXpm
+    xorg.libXt
+  ];
 
   preConfigure = ''
     cd xspim