diff options
author | Domen Kožar <domen@dev.si> | 2015-01-08 10:26:49 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-01-08 10:26:49 +0100 |
commit | 9b7b2ce8eb855b99598183b06bbd2f021e01d359 (patch) | |
tree | 6208aca2cacac8adb19c64dc2a3d1ada2f7408ef /pkgs/os-specific | |
parent | 6671aff83e4082f3a825c456cf259b9e30ae702c (diff) | |
download | nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar.gz nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar.bz2 nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar.lz nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar.xz nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.tar.zst nixpkgs-9b7b2ce8eb855b99598183b06bbd2f021e01d359.zip |
Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f72980e84230b72b631258df1755919. See #5368
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/cctools-port/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/hwdata/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/x86info/default.nix | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/cctools-port/default.nix b/pkgs/os-specific/darwin/cctools-port/default.nix index eb4924ef8d4..cdc259c1e2a 100644 --- a/pkgs/os-specific/darwin/cctools-port/default.nix +++ b/pkgs/os-specific/darwin/cctools-port/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' + patchShebangs tools sed -i -e 's/which/type -P/' tools/*.sh sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 57785d40132..325a44f97aa 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; }; + preConfigure = "patchShebangs ./configure"; + configureFlags = "--datadir=$(prefix)/data"; meta = { diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index ef1935b931f..54bd33cc92f 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' + patchShebangs . + # ignore warnings sed -i 's/-Werror -Wall//' Makefile ''; |