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

treewide/xorg: replace *proto with xorgproto

Browse Source
This commit is contained in:
Lengyel Balazs
2019-01-04 14:38:57 +01:00
committed by Robin Gloster
parent 51d6b1bdec
commit f4a53ff3bc
133 changed files with 348 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ocaml/generic.nix
+3 -3
View File
@@ -11,7 +11,7 @@ let
in
{ stdenv, fetchurl, ncurses, buildEnv
, libX11, xproto, useX11 ? safeX11 stdenv
, libX11, xorgproto, useX11 ? safeX11 stdenv
, flambdaSupport ? false
}:
@@ -25,7 +25,7 @@ let
in
let
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; };
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
in
@@ -48,7 +48,7 @@ stdenv.mkDerivation (args // rec {
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
++ optionals useX11 [ libX11 xproto ];
++ optionals useX11 [ libX11 xorgproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)