diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 12:42:41 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:24:03 +0700 |
commit | 108bdac3d99b6d94d3740422af5945e510238304 (patch) | |
tree | dd91cf11f7c29bbd4542f5bdab986430025c02e2 /pkgs/applications/misc/goldendict | |
parent | 2e34288f0d8cf01eea228c7dbc50af9589b885f3 (diff) |
pkgs/applications: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/misc/goldendict')
-rw-r--r-- | pkgs/applications/misc/goldendict/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 0fb4b3f2b974f..63b36e2dec4be 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -21,28 +21,28 @@ mkDerivation rec { patches = [ ./0001-dont-check-for-updates.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ ./0001-dont-use-maclibs.patch ]; postPatch = '' substituteInPlace goldendict.pro \ - --replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}" + --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" ''; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ] - ++ stdenv.lib.optional withCC opencc - ++ stdenv.lib.optional withEpwing libeb - ++ stdenv.lib.optional withExtraTiff libtiff - ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ] - ++ stdenv.lib.optional withZim zstd; + ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ++ lib.optional withCC opencc + ++ lib.optional withEpwing libeb + ++ lib.optional withExtraTiff libtiff + ++ lib.optionals withFFmpeg [ libao ffmpeg_3 ] + ++ lib.optional withZim zstd; - qmakeFlags = with stdenv.lib; [ + qmakeFlags = with lib; [ "goldendict.pro" (optional withCC "CONFIG+=chinese_conversion_support") (optional (!withCC) "CONFIG+=no_chinese_conversion_support") @@ -53,7 +53,7 @@ mkDerivation rec { (optional withZim "CONFIG+=zim_support") ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict |