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: 92e5745383a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b23f3030539
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 1, 2019

  1. renderdoc: use default python3 (#58687)

    @dotlambda
    dotlambda authored Apr 1, 2019
    Copy the full SHA
    2b23f30 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/graphics/renderdoc/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/renderdoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtx11extras, qtsvg, makeWrapper
, vulkan-loader, xorg
, python36, bison, pcre, automake, autoconf
, python3, bison, pcre, automake, autoconf
}:
let
custom_swig = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};

buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
];

nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ];