diff options
| author | Florian Klink <flokli@flokli.de> | 2019-12-15 15:07:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 15:07:07 +0100 |
| commit | 0380ed20db00abee306faa91545fcefb67c0a625 (patch) | |
| tree | 83460409dc878cc6d9ea97cb67d50e0d7b4b79ec | |
| parent | 2a1a4cad38ce7e5b34887f3f0ecb604595a21feb (diff) | |
| parent | ac1a5ac2dbe615df8932fe821c461de5874f13d6 (diff) | |
| download | nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar.gz nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar.bz2 nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar.lz nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar.xz nixlib-0380ed20db00abee306faa91545fcefb67c0a625.tar.zst nixlib-0380ed20db00abee306faa91545fcefb67c0a625.zip | |
Merge pull request #75657 from flokli/gtkwave-gtk3
gtkwave: build with gtk3
| -rw-r--r-- | pkgs/applications/science/electronics/gtkwave/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 9b52e8c50519..75d69d3e499e 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: +{ stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: stdenv.mkDerivation rec { pname = "gtkwave"; version = "3.3.103"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; - sha256 = "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3"; + url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; + sha256 = "0djqfnxy772a9p44wnm5ansbih7jg76xv1hvcpkv3gblhkzg49ay"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 gperf bzip2 tcl tk judy xz ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--enable-judy" + "--enable-gtk3" + ]; meta = { description = "VCD/Waveform viewer for Unix and Win32"; |