From a84278aee5fa0cfb0da6707628539f9b1256f6c3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:01:53 +0800 Subject: filezilla: use wxGTK30-gtk3 instead of local override --- pkgs/applications/networking/ftp/filezilla/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 96a4227b36e1..04f0296fe82e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -10,16 +10,10 @@ , pugixml , sqlite , tinyxml -, wxGTK30 +, wxGTK30-gtk3 , xdg_utils }: -let - # we can drop this when wxgtk is built with gtk3 by default - # see: https://github.com/NixOS/nixpkgs/pull/73145 - wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; }; - -in stdenv.mkDerivation rec { pname = "filezilla"; version = "3.48.1"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxgtk' - wxgtk'.gtk + wxGTK30-gtk3 + wxGTK30-gtk3.gtk xdg_utils ]; -- cgit 1.4.1 From 78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:02:19 +0800 Subject: spek: 0.8.3 -> unstable-2018-12-29 Build using the newly introduced wxGTK30-gtk3 in order to drop old gtk2 and ffmpeg dependencies. --- pkgs/applications/audio/spek/default.nix | 25 +++++++++++++------------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 88b22c59ae50..d6918b192315 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "0.8.3"; + version = "unstable-2018-12-29"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; - sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; + src = fetchFromGitHub { + owner = "alexkay"; + repo = "spek"; + rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; + sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; + # needed for autoreconfHook + AUTOPOINT="intltoolize --automake --copy"; - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + + buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; homepage = "http://spek.cc/"; license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e98b1f9c18d..96e38d5280b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22194,9 +22194,7 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { - ffmpeg = ffmpeg_2; - }; + spek = callPackage ../applications/audio/spek { }; spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; -- cgit 1.4.1 From 154cbdece1e00cf36b193e131f97a77e22633dcf Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:34:25 +0800 Subject: limesuite: use wxGTK30-gtk3 --- pkgs/applications/radio/limesuite/default.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index ef36eac28e42..7cadceab5611 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchFromGitHub, cmake -, sqlite, wxGTK30, libusb1, soapysdr +, sqlite, wxGTK30-gtk3, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk } : -let - version = "20.01.0"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "limesuite"; - inherit version; + version = "20.01.0"; src = fetchFromGitHub { owner = "myriadrf"; @@ -17,14 +14,16 @@ in stdenv.mkDerivation { sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + buildInputs = [ libusb1 sqlite - wxGTK30 + wxGTK30-gtk3 fltk gnuplot libusb1 @@ -34,11 +33,8 @@ in stdenv.mkDerivation { ]; postInstall = '' - mkdir -p $out/lib/udev/rules.d - cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d - - mkdir -p $out/share/limesuite - cp bin/Release/lms7suite_mcu/* $out/share/limesuite + install -Dm444 -t $out/lib/udev/rules.d ../udev-rules/64-limesuite.rules + install -Dm444 -t $out/share/limesuite bin/Release/lms7suite_mcu/* ''; meta = with stdenv.lib; { -- cgit 1.4.1 From 227561d5f829779f6a2b1e0009983f10e83d68fe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:34:38 +0800 Subject: cubicsdr: use wxGTK31-gtk3 --- pkgs/applications/radio/cubicsdr/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index ef4d68af54c6..c85299606c03 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }: + pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK ]; + + buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96e38d5280b9..1c4282153ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19128,7 +19128,7 @@ in ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; + cubicsdr = callPackage ../applications/radio/cubicsdr { }; cum = callPackage ../applications/misc/cum { }; -- cgit 1.4.1