From 75fc704cfef3823b41b1dbca5c42ee0ca9b67645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Jan 2017 14:04:49 +0100 Subject: [PATCH] treewide: more fixes of phases after bash 4.3 -> 4.4 --- pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 +- pkgs/misc/themes/orion/default.nix | 1 - pkgs/tools/text/zimreader/default.nix | 2 +- pkgs/tools/text/zimwriterfs/default.nix | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index fb655ceba5d..87c4df3446e 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; - preConfigurePhases = '' + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix index 4872d62ae51..9ba8cd368cf 100644 --- a/pkgs/misc/themes/orion/default.nix +++ b/pkgs/misc/themes/orion/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - phases = "$prePhases unpackPhase installPhase fixupPhase $postPhases"; installPhase = '' mkdir -p $out/share/themes/orion cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 449b1e9c339..1c508a9cf7e 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; - preConfigurePhases = [ "./autogen.sh" ]; + preConfigure = "./autogen.sh"; meta = { description = "A tool to serve ZIM files using HTTP"; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 62f0ff99123..db604d862b8 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ]; setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`"; - preConfigurePhases = [ "./autogen.sh" ]; + preConfigure = "./autogen.sh"; meta = { description = "A console tool to create ZIM files";