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

Commits on Jul 1, 2017

  1. gede: replace build.patch with inline sed call 

    The patch file is much larger than the logical change made.
    @joachifm
    joachifm committed Jul 1, 2017
    Copy the full SHA
    6e36e7f View commit details

  2. gede: fix sandboxed build 

    build.py relies on /usr/bin/env; invoke python directly instead to
sidestep the issue.
    @joachifm
    joachifm committed Jul 1, 2017
    Copy the full SHA
    4f320d3 View commit details

  3. gede: add ctags and gdb to path via wrapper

    @joachifm
    joachifm committed Jul 1, 2017
    Copy the full SHA
    0040dba View commit details

  4. gede: 2.0.3 -> 2.0.4

    @joachifm
    joachifm committed Jul 1, 2017
    Copy the full SHA
    80c2c58 View commit details
Showing with 17 additions and 24 deletions.
  1. +0 −11 pkgs/development/tools/misc/gede/build.patch
  2. +17 −13 pkgs/development/tools/misc/gede/default.nix
11 changes: 0 additions & 11 deletions pkgs/development/tools/misc/gede/build.patch
View file

This file was deleted.

30 changes: 17 additions & 13 deletions pkgs/development/tools/misc/gede/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
{stdenv, fetchurl, ctags, qt4, python}:
{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }:

stdenv.mkDerivation rec {

version = "2.0.3";
name = "gede-${version}";
version = "2.0.4";

src = fetchurl {
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
sha256 = "1znlmkjgrmjl79q73xaa9ybp1xdc3k4h4ynv3jj5z8f92gjnj3kk";
sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba";
};

buildInputs = [ ctags qt4 python ];
patches = [ ./build.patch ];
nativeBuildInputs = [ makeWrapper python ];

unpackPhase = ''
tar xf ${src}
cd ${name}
buildInputs = [ qt4 ];

postPatch = ''
sed -i build.py -e 's,qmake-qt4,qmake,'
'';

buildPhase = ":";

installPhase = ''
python build.py install --prefix="$out"
wrapProgram $out/bin/gede \
--prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]}
'';
configurePhase = "";
buildPhase = "";
installPhase = "./build.py install --prefix=$out";

meta = with stdenv.lib; {
description = "Graphical frontend (GUI) to GDB";
@@ -28,4 +33,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ juliendehos ];
};
}