diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 18:50:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 18:50:22 +0100 |
| commit | 4caab41c1b4b57d9d971a1c1e5c4da35648615d4 (patch) | |
| tree | e6814d5064422ca2abd8e4d3014ebe85ed04968a /pkgs/applications/misc | |
| parent | 11dab7bd4aa0eaf0f0cead46427a67f5deaf3221 (diff) | |
| parent | 3ddead70852a5d484b063fec52973c56bad22601 (diff) | |
| download | nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.gz nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.bz2 nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.lz nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.xz nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.zst nixpkgs-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.zip | |
Merge pull request #37693 from jtojnar/min-nix-two
treewide: Re-add reverted Nix 2 syntax features
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/qpdfview/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index dfaa90d43ad..263bc37660c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -21,11 +21,16 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - - # 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" - ''; + 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" + ]; meta = { inherit (s) version; |