diff options
| author | sternenseemann | 2024-09-27 11:41:25 +0200 |
|---|---|---|
| committer | sternenseemann | 2024-09-27 11:41:25 +0200 |
| commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
| tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/by-name/ph | |
| parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
| parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) | |
Merge branch master into haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/by-name/ph')
| -rw-r--r-- | pkgs/by-name/ph/photoqt/package.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index ff80e9bc1542..6e66d6885efc 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { qt6Packages.poppler zxing-cpp ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mpv qt6.qtwayland ]; @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { (lib.cmakeBool "CHROMECAST" false) (lib.cmakeBool "FREEIMAGE" false) (lib.cmakeBool "IMAGEMAGICK" false) - (lib.cmakeBool "VIDEO_MPV" (!stdenv.isDarwin)) + (lib.cmakeBool "VIDEO_MPV" (!stdenv.hostPlatform.isDarwin)) ]; env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/photoqt.app $out/Applications makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt |