From 614cf5d00aa87587a9869bfeb0b78ad3f07563b2 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 26 Oct 2019 08:37:56 +0200 Subject: [PATCH] Revert "qpdfview: escape "*.pro" qmakeFlags" This reverts commit 7bb372b664ee48d552c0d3ff798e6aa00d2498bb. --- pkgs/applications/misc/qpdfview/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index d6c813ba40cc..4100ab3536b7 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -23,6 +23,10 @@ mkDerivation { inherit (s) url sha256; }; + preConfigure = '' + qmakeFlags+=(*.pro) + ''; + qmakeFlags = [ "TARGET_INSTALL_PATH=${placeholder "out"}/bin" "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" @@ -31,7 +35,6 @@ mkDerivation { "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" - "\*.pro" # escaping needed here ]; meta = {