diff options
author | Nikolay Korotkiy <sikmir@disroot.org> | 2024-02-23 01:42:36 +0400 |
---|---|---|
committer | Nikolay Korotkiy <sikmir@disroot.org> | 2024-02-23 04:29:47 +0400 |
commit | dfc25f4e049ae65152cab9642037ce0585a0fd17 (patch) | |
tree | 84395d02d0ee6c7ea505ea32a18ec559fef19a29 /pkgs/by-name/ls | |
parent | 52eace11d2ea1fb7863cb06756b6a45c01303bcd (diff) |
lsd2dsl: 0.5.4 → 0.6.0
Diffstat (limited to 'pkgs/by-name/ls')
-rw-r--r-- | pkgs/by-name/ls/lsd2dsl/package.nix | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix index 40907c2c0e9dd..4ab26b40a7c2e 100644 --- a/pkgs/by-name/ls/lsd2dsl/package.nix +++ b/pkgs/by-name/ls/lsd2dsl/package.nix @@ -1,23 +1,40 @@ { lib, stdenv, fetchFromGitHub , makeDesktopItem, copyDesktopItems, cmake -, boost, libvorbis, libsndfile, minizip, gtest, qt5 }: +, boost, cups, fmt, libvorbis, libsndfile, minizip, gtest, qt6 }: stdenv.mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "nongeneric"; repo = "lsd2dsl"; rev = "v${version}"; - sha256 = "sha256-PLgfsVVrNBTxI4J0ukEOFRoBkbmB55/sLNn5KyiHeAc="; + hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM="; }; - nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ] ++ lib.optional stdenv.isLinux copyDesktopItems; - - buildInputs = [ boost libvorbis libsndfile minizip gtest qt5.qtwebkit ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + ''; - env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ] ++ lib.optional stdenv.isLinux copyDesktopItems; + + buildInputs = [ + boost + cups + fmt + libvorbis + libsndfile + minizip + gtest + qt6.qt5compat + qt6.qtwebengine + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; desktopItems = lib.singleton (makeDesktopItem { name = "lsd2dsl"; |