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/compilers/ocaml/3.08.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11 }:
{ stdenv, fetchurl, xlibsWrapper }:
stdenv.mkDerivation {
name = "ocaml-3.08.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
configureScript = ./configure-3.08.0;
dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" x11];
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"];
}

6
pkgs/development/compilers/ocaml/3.10.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, ncurses }:
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
stdenv.mkDerivation (rec {
@@ -10,9 +10,9 @@ stdenv.mkDerivation (rec {
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" x11];
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''
CAT=$(type -tp cat)

6
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11 }:
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
];
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
prePatch = ''
CAT=$(type -tp cat)

6
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11 }:
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = !stdenv.isArm && !stdenv.isMips;
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
preConfigure = ''

6
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11 }:
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = !stdenv.isArm && !stdenv.isMips;
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
CAT=$(type -tp cat)

6
pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11 }:
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ];
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installFlags = "-i";
installTargets = "install"; # + optionalString useNativeCompilers " installopt";
prePatch = ''

6
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, ncurses }:
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
stdenv.mkDerivation (rec {
@@ -10,9 +10,9 @@ stdenv.mkDerivation (rec {
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" x11];
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''
CAT=$(type -tp cat)