public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: replace its usage by xlibsWrapper directly

Browse Source 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
This commit is contained in:
Vladimír Čunát
2015-09-15 11:13:22 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/pure-modules/gl/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }:
{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }:
stdenv.mkDerivation rec {
baseName = "gl";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ pure freeglut mesa x11 ];
propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ];
makeFlags = "libdir=$(out)/lib prefix=$(out)/";
setupHook = ../generic-setup-hook.sh;

4
pkgs/development/pure-modules/tk/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }:
{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }:
stdenv.mkDerivation rec {
baseName = "tk";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ pure tcl tk x11 ];
propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];
makeFlags = "libdir=$(out)/lib prefix=$(out)/";
setupHook = ../generic-setup-hook.sh;