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
base: 4c797160f887
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a6809c0dd069
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2018

  1. cmake: don't override cmakeDir when set (#40687) 

    When dontUseCmakeBuildDir is true (aka the default), it overrides
cmakeDir regardless of the package configuration.

While packaging netbee, I needed to both keep dontUseCmakeBuildDir to
true (some hardcoded paths expect the build folder) and set cmakeDir
(since CMakeList.txt was in a subfolder) which proved impossible.
Here is the fix.
    @orivej
    Matthieu Coudron authored and orivej committed Jun 3, 2018
    Copy the full SHA
    a6809c0 View commit details
    Browse the repository at this point in the history