Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3946ade5513c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 291dac48cf83
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 23, 2020

  1. mc: /bin/rm does not exist

    @peterhoeg
    peterhoeg committed Jan 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jabranham Alex Branham
    GPG key ID: 1E4227A253E99AC7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e527dc6 View commit details

Commits on Jan 27, 2020

  1. Merge pull request #78349 from peterhoeg/fix_mc 

    mc: /bin/rm does not exist
    @peterhoeg
    peterhoeg authored Jan 27, 2020
    Copy the full SHA
    291dac4 View commit details
Showing with 39 additions and 8 deletions.
  1. +39 −8 pkgs/tools/misc/mc/default.nix
47 changes: 39 additions & 8 deletions pkgs/tools/misc/mc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs
, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}:
{ stdenv
, fetchurl
, pkgconfig
, glib
, gpm
, file
, e2fsprogs
, libX11
, libICE
, perl
, zip
, unzip
, gettext
, slang
, libssh2
, openssl
, coreutils
}:

stdenv.mkDerivation rec {
pname = "mc";
@@ -13,26 +29,41 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];

buildInputs = [
perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
file
gettext
glib
libICE
libX11
libssh2
openssl
perl
slang
unzip
zip
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

enableParallelBuilding = true;

configureFlags = [ "--enable-vfs-smb" ];

postPatch = ''
substituteInPlace src/filemanager/ext.c \
--replace /bin/rm ${coreutils}/bin/rm
'';

postFixup = ''
# remove unwanted build-dependency references
sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
'';

meta = {
meta = with stdenv.lib; {
description = "File Manager and User Shell for the GNU Project";
homepage = http://www.midnight-commander.org;
downloadPage = "http://www.midnight-commander.org/downloads/";
homepage = "http://www.midnight-commander.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander ];
platforms = with platforms; linux ++ darwin;
repositories.git = git://github.com/MidnightCommander/mc.git;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
updateWalker = true;
};
}