From 07bd1d873789039e17cc143293ad9ff723d500d2 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 13 Aug 2018 08:47:02 +0900 Subject: kicad: use default cmake --- pkgs/applications/science/electronics/kicad/default.nix | 3 +-- pkgs/applications/science/electronics/kicad/unstable.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3e783d2e177c..c92da3eeb292 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; nativeBuildInputs = [ - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - (cmake.override {majorVersion = "3.10";}) + cmake doxygen pkgconfig wrapGAppsHook diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index e43fd59e0431..a9a4c32a0b45 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]; - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost -- cgit 1.4.1 From 8fc6472ace275f24a0530eb191d5d89bc8aee35e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 30 Aug 2018 19:47:11 +0200 Subject: gnome-documents, tlaplus: fix glib references --- pkgs/applications/science/logic/tlaplus/toolbox.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 342d91cf5825..f1116a27c0be 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 9948f9d909b2..f8ce9545a33d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" ''; passthru = { -- cgit 1.4.1