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: 9613cc810491
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2316b8da0e5e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 13, 2019

  1. podman: enable on darwin

    @marsam
    marsam committed Dec 13, 2019
    Copy the full SHA
    072cdcb View commit details

  2. podman: add marsam to maintainers

    @marsam
    marsam committed Dec 13, 2019
    Copy the full SHA
    d712be5 View commit details

Commits on Jan 22, 2020

  1. Merge pull request #78002 from marsam/update-podman 

    podman: enable on darwin
    @marsam
    marsam authored Jan 22, 2020
    Copy the full SHA
    2316b8d View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/applications/virtualization/podman/default.nix
12 changes: 7 additions & 5 deletions pkgs/applications/virtualization/podman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,12 +20,14 @@ buildGoPackage rec {

nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ];

buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ];

buildPhase = ''
pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
pushd go/src/${goPackagePath}
patchShebangs .
make binaries docs
${if stdenv.isDarwin
then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all"
else "make binaries docs"}
'';

installPhase = ''
@@ -39,7 +41,7 @@ buildGoPackage rec {
homepage = https://podman.io/;
description = "A program for managing pods, containers and container images";
license = licenses.asl20;
maintainers = with maintainers; [ vdemeester saschagrunert ];
platforms = platforms.linux;
maintainers = with maintainers; [ vdemeester saschagrunert marsam ];
platforms = platforms.unix;
};
}