Unverified Commit 1d900597 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

various: switch from replace to replace-fail (#512135)

parents 32c9fc9a 4a2e7894

pkgs/by-name/_2/_20kly/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { 


  patchPhase = ''

    substituteInPlace lightyears \

      --replace \

      --replace-fail \

        "LIGHTYEARS_DIR = \".\"" \

        "LIGHTYEARS_DIR = \"$out/share\""

  '';

pkgs/by-name/_3/_3proxy/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { 
  # Don't strip binary on install, we strip it on fixup phase anyway.

  postPatch = ''

    substituteInPlace Makefile.Linux \

      --replace "(INSTALL_BIN) -s" "(INSTALL_BIN)" \

      --replace "/usr" ""

      --replace-fail "(INSTALL_BIN) -s" "(INSTALL_BIN)" \

      --replace-fail "/usr" ""

  '';



  makeFlags = [

pkgs/by-name/_7/_7zip-zstd/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ''

  + lib.optionalString stdenv.hostPlatform.isMinGW ''

    substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \

      --replace windres.exe ${stdenv.cc.targetPrefix}windres

      --replace-fail windres.exe ${stdenv.cc.targetPrefix}windres

  '';



  buildPhase =

pkgs/by-name/_7/_7zz/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { 


  postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''

    substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \

      --replace windres.exe ${stdenv.cc.targetPrefix}windres

      --replace-fail windres.exe ${stdenv.cc.targetPrefix}windres

  '';



  env.NIX_CFLAGS_COMPILE = toString (

pkgs/by-name/_9/_9base/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ stdenv.mkDerivation { 
  # the 9yacc script needs to be executed to build other items

  preBuild = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    substituteInPlace ./yacc/9yacc \

      --replace "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"

      --replace-fail "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"

  '';



  enableParallelBuilding = true;