From b60565ed4d41584adb62cf3ab2afee85bf6f8144 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 21 Sep 2023 09:56:14 +0200 Subject: [PATCH] bluej: use dpkg instead of manual preUnpackHook --- pkgs/applications/editors/bluej/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index ddcb002db5d1..a90cfba529fb 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook, zstd }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bluej"; @@ -12,21 +12,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ zstd wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; buildInputs = [ glib ]; - sourceRoot = "."; - - preUnpack = '' - unpackCmdHooks+=(_tryDebData) - _tryDebData() { - if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi - ar xf $src - if ! [[ -e data.tar.zst ]]; then return 1; fi - unpackFile data.tar.zst - } - ''; - dontWrapGApps = true; installPhase = ''