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 12:08:24 +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
pkgs/applications/window-managers/ion-3/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, lua, gettext, groff }:
{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
stdenv.mkDerivation {
name = "ion-3-20090110";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ x11 lua gettext groff ];
buildInputs = [ xlibsWrapper lua gettext groff ];
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
}
pkgs/applications/window-managers/notion/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
stdenv, fetchurl,
lua, gettext, groff,
pkgconfig, busybox,
x11, libXinerama, libXrandr, libX11
xlibsWrapper, libXinerama, libXrandr, libX11
}:
assert enableXft -> libXft != null;
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;
postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";
buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
pkgs/applications/window-managers/weston/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null
# beware of null defaults, as the parameters *are* supplied by callPackage by default
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm
pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
libwebp
];