about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-01-06 14:04:49 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-01-06 14:05:22 +0100
commit75fc704cfef3823b41b1dbca5c42ee0ca9b67645 (patch)
tree123872c89a9d29899d9644ac2b67ba0d2784c4d0 /pkgs
parent29e93555ec43618c8fee71a301a5485e1189ab9b (diff)
downloadnixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar.gz
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar.bz2
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar.lz
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar.xz
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.tar.zst
nixlib-75fc704cfef3823b41b1dbca5c42ee0ca9b67645.zip
treewide: more fixes of phases after bash 4.3 -> 4.4
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/pcmanx-gtk2/default.nix2
-rw-r--r--pkgs/misc/themes/orion/default.nix1
-rw-r--r--pkgs/tools/text/zimreader/default.nix2
-rw-r--r--pkgs/tools/text/zimwriterfs/default.nix2
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 fb655ceba5dc..87c4df3446ed 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 4872d62ae512..9ba8cd368cf7 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 449b1e9c3398..1c508a9cf7ec 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 62f0ff991237..db604d862b88 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";