diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-06-16 06:31:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 06:31:35 +0800 |
commit | 6d95cf3de40fc6df4274d7795f2f3e11b01c0506 (patch) | |
tree | 4d94d3a3f23db6cafd889a20258204533230923c /pkgs/applications | |
parent | c09eb57e38e2ee6fb3fd5735012ceab12ea9e08f (diff) | |
parent | 227561d5f829779f6a2b1e0009983f10e83d68fe (diff) | |
download | nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar.gz nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar.bz2 nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar.lz nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar.xz nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.tar.zst nixlib-6d95cf3de40fc6df4274d7795f2f3e11b01c0506.zip |
Merge pull request #90428 from NixOS/wxgtk_gtk3
wxGTK3: make gtk2 and gtk3 specific variants
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/spek/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/networking/ftp/filezilla/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/radio/cubicsdr/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/radio/limesuite/default.nix | 24 |
4 files changed, 29 insertions, 37 deletions
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/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 ]; 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/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; { |