nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118461 from aaschmid/rmlint.darwin.support

Browse Source
This commit is contained in:
Sandro 2021-04-12 00:56:29 +02:00 committed by GitHub
commit 0e95d213c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -118,6 +118,12 @@
githubId = 2258953;
name = "Aaron Schif";
};
aaschmid = {
email = "service@aaschmid.de";
github = "aaschmid";
githubId = 567653;
name = "Andreas Schmid";
};
abaldeau = {
email = "andreas@baldeau.net";
github = "baldo";

27
pkgs/tools/misc/rmlint/default.nix
View File

@ -18,6 +18,8 @@
, wrapGAppsHook
, withGui ? false }:
assert withGui -> !stdenv.isDarwin;
with lib;
stdenv.mkDerivation rec {
pname = "rmlint";
@ -30,12 +32,9 @@ stdenv.mkDerivation rec {
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
};
CFLAGS="-I${lib.getDev util-linux}/include";
nativeBuildInputs = [
pkg-config
sphinx
gettext
scons
] ++ lib.optionals withGui [
makeWrapper
@ -57,9 +56,21 @@ stdenv.mkDerivation rec {
python3.pkgs.pygobject3
];
# this doesn't seem to support configureFlags, and appends $out afterwards,
# so add the --without-gui in front of it
prefixKey = lib.optionalString (!withGui) " --without-gui " + "--prefix=";
prePatch = ''
export CFLAGS="$NIX_CFLAGS_COMPILE"
export LDFLAGS="''${NIX_LDFLAGS//-rpath /-Wl,-rpath=}"
# remove sources of nondeterminism
substituteInPlace lib/cmdline.c \
--replace "__DATE__" "\"Jan 1 1970\"" \
--replace "__TIME__" "\"00:00:00\""
substituteInPlace docs/SConscript \
--replace "gzip -c " "gzip -cn "
'';
prefixKey = "--prefix=";
sconsFlags = lib.optionals (!withGui) [ "--without-gui" ];
# in GUI mode, this shells out to itself, and tries to import python modules
postInstall = lib.optionalString withGui ''
@ -70,8 +81,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
homepage = "https://rmlint.readthedocs.org";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = [ maintainers.koral ];
maintainers = with maintainers; [ aaschmid koral ];
};
}