Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

woeusb,jetbrains,ark: prune p7zip #86497

Merged
3 commits merged into from
May 2, 2020
Merged

woeusb,jetbrains,ark: prune p7zip #86497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f46542
woeusb: remove p7zip
eadwu May 1, 2020
9ccf081
jetbrains: remove p7zip from nativeBuildInputs
eadwu May 1, 2020
142d288
ark: remove p7zip
eadwu May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/editors/jetbrains/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:

Expand Down Expand Up @@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
'';
};

nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
nativeBuildInputs = [ makeWrapper patchelf unzip ];

patchPhase = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/kde/ark/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
libarchive, libzip,

# Archive tools
p7zip, lrzip,
lrzip,

# Unfree tools
unfreeEnableUnrar ? false, unrar,
}:

let
extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar;
extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar;
in

mkDerivation {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/misc/woeusb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget
, wxGTK30 }:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# should be patched with a less useless default PATH, but for now
# we add everything we need manually.
wrapProgram "$out/bin/woeusb" \
--set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
--set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}'
'';

doInstallCheck = true;
Expand Down