Commit eeb00de3 authored by OPNA2608's avatar OPNA2608
Browse files

pdisk: Modernise

- Switch to finalAttrs
- Don't use pname in src args
- src.rev -> src.tag
- Use --replace-fail
- Enable strictDeps
- Drop meta-wide "with lib"
- Add meta.mainProgram
- Migrate to pkgs/by-name
parent d768cd5b
Loading
Loading
Loading
Loading
+19 −22
Original line number Diff line number Diff line
@@ -5,18 +5,16 @@
  fetchpatch,
  installShellFiles,
  libbsd,
  CoreFoundation,
  IOKit,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "pdisk";
  version = "0.9";

  src = fetchFromGitHub {
    owner = "apple-oss-distributions";
    repo = pname;
    rev = "${pname}-${lib.versions.minor version}";
    repo = "pdisk";
    tag = "pdisk-${lib.versions.minor finalAttrs.version}";
    hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs=";
  };

@@ -46,24 +44,21 @@ stdenv.mkDerivation rec {
  postPatch =
    ''
      substituteInPlace makefile \
        --replace 'cc' '${stdenv.cc.targetPrefix}cc'
        --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace makefile \
        --replace '-lbsd' '-framework CoreFoundation -framework IOKit'
        --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit'
    '';

  strictDeps = true;

  nativeBuildInputs = [
    installShellFiles
  ];

  buildInputs =
    lib.optionals (!stdenv.hostPlatform.isDarwin) [
  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
    libbsd
    ]
    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
      CoreFoundation
      IOKit
  ];

  env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
@@ -73,8 +68,9 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall

    install -Dm755 cvt_pt $out/bin/cvt_pt
    install -Dm755 pdisk $out/bin/pdisk
    for exe in pdisk cvt_pt; do
      install -Dm755 -t $out/bin $exe
    done

    installManPage pdisk.8
    install -Dm644 pdisk.html $out/share/doc/pdisk/pdisk.html
@@ -82,14 +78,15 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

  meta = with lib; {
  meta = {
    description = "Low-level Apple partition table editor for Linux, OSS Apple version";
    homepage = "https://github.com/apple-oss-distributions/pdisk";
    license = with licenses; [
    license = with lib.licenses; [
      hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)
      apple-psl10 # new files
    ];
    maintainers = with maintainers; [ OPNA2608 ];
    platforms = platforms.unix;
    mainProgram = "pdisk";
    maintainers = with lib.maintainers; [ OPNA2608 ];
    platforms = lib.platforms.unix;
  };
}
})
+0 −4
Original line number Diff line number Diff line
@@ -3574,10 +3574,6 @@ with pkgs;
  gzip = callPackage ../tools/compression/gzip { };
  pdisk = callPackage ../tools/system/pdisk {
    inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
  };
  plplot = callPackage ../development/libraries/plplot {
    inherit (darwin.apple_sdk.frameworks) Cocoa;
  };