summary refs log tree commit diff
diff options
context:
space:
mode:
authorJason "Don" O'Conal <lovek323@gmail.com>2014-03-03 15:08:56 +1100
committerJason "Don" O'Conal <lovek323@gmail.com>2014-03-03 21:13:36 +1100
commit7bf77e413d848c863a13950dfa1ef2d54d08aedf (patch)
tree79e862bf6ba8daf46de8d6c397f1107a8f4725db
parent69a83ba99f9d5f6aff7477f5074687512401f414 (diff)
downloadnixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar.gz
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar.bz2
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar.lz
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar.xz
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.tar.zst
nixpkgs-7bf77e413d848c863a13950dfa1ef2d54d08aedf.zip
lesstif: fix build on Darwin
* x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on
  Darwin systems, so pass in xlibsWrapper to the lesstif build instead
-rw-r--r--pkgs/development/libraries/lesstif/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 21b4eac30af..8d01c2f2f43 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libXp, libXau}:
+{stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
 stdenv.mkDerivation {
   name = "lesstif-0.95.0-p2";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
     md5 = "ab895165c149d7f95843c7584b1c7ad4";
   };
-  buildInputs = [x11];
+  buildInputs = [xlibsWrapper];
   propagatedBuildInputs = [libXp libXau];
 
   # The last stable release of lesstif was in June 2006. These