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: 1e21d7bcd510
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d6f7fdc772a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 28, 2020

  1. dmd: fix build

    @globin
    globin committed Apr 28, 2020
    Copy the full SHA
    0114400 View commit details

  2. objc4-osx: fix build

    @globin
    globin committed Apr 28, 2020
    Copy the full SHA
    9d6f7fd View commit details
Showing with 1 addition and 3 deletions.
  1. +1 −1 pkgs/development/compilers/dmd/default.nix
  2. +0 −2 pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/compilers/dmd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
"osx"
else
stdenv.hostPlatform.parsed.kernel.name;
top = "$(echo $NIX_BUILD_TOP)";
top = "$(echo $NIX_BUILD_TOP/$sourceRoot)";
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";

# Buid and install are based on http://wiki.dlang.org/Building_DMD
2 changes: 0 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{ appleDerivation }:

appleDerivation {
phases = [ "unpackPhase" "installPhase" ];

# Not strictly necessary, since libSystem depends on it, but it's nice to be explicit so we
# can easily find out what's impure.
__propagatedImpureHostDeps = [