From 5b53774f89ee4288554d5f45cf58c74787e421fb Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Dec 2017 10:22:08 +0000 Subject: [PATCH] qt4: fix darwin install phase by creating $out before copying lib to $out --- .../libraries/qt-4.x/4.8/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 369f328666da18..6c257e95436c9d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -187,30 +187,27 @@ stdenv.mkDerivation rec { installPhase = optionalString stdenv.isDarwin '' runHook preInstall + + mkdir -p $out cp -r lib $out mkdir -p $out/Applications mv bin/*.app $out/Applications - rm -rf bin/*.app - cp -r bin $out mkdir -p $out/share/doc/${name} - mkdir -p $out/lib - mkdir -p $out/lib/qt4/plugins - mkdir -p $out/lib/qt4/imports - mkdir -p $out/bin - mkdir -p $out/include - mkdir -p $out/share/${name} + cp -r doc/* $out/share/doc/${name} + mkdir -p $out/lib/qt4 + cp -r plugins $out/lib/qt4 + cp -r imports $out/lib/qt4 + + mkdir -p $out/share/${name} cp -r mkspecs $out/share/${name} cp -r translations $out/share/${name} cp -r tools/linguist/phrasebooks $out/share/${name} cp tools/porting/src/q3porting.xml $out/share/${name} - cp -r plugins $out/lib/qt4 - cp -r imports $out/lib/qt4 - cp -r doc/* $out/share/doc/${name} runHook postInstall '';