diff options
author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/development/compilers/ocaml | |
parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
download | nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.gz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.bz2 nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.lz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.xz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.zst nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.zip |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/development/compilers/ocaml')
-rw-r--r-- | pkgs/development/compilers/ocaml/ber-metaocaml.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 999b2ebd6f67..a933151de12a 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl , ncurses -, libX11, xproto, buildEnv +, libX11, xorgproto, buildEnv }: let useX11 = stdenv.isi686 || stdenv.isx86_64; - x11deps = [ libX11 xproto ]; + x11deps = [ libX11 xorgproto ]; inherit (stdenv.lib) optionals; baseOcamlBranch = "4.07"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d1ee43c9152e..7ada5b804e35 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -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) |