From 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Apr 2018 02:22:54 +0200 Subject: [PATCH] qpdfview: remove placeholder usage --- pkgs/applications/misc/qpdfview/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index a4fd1d356746..f836ce5b8085 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -21,16 +21,11 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - qmakeFlags = [ - "*.pro" - "TARGET_INSTALL_PATH=${placeholder "out"}/bin" - "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" - "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" - "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" - "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" - "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" - ]; + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" + ''; meta = { inherit (s) version;