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: 25a3e8a2a97b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50b2554e7e82
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 15, 2020

  1. use wrapQtAppsHook in xygrib

    @x123
    x123 committed Jan 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ab7f24 View commit details

  2. Merge pull request #77772 from x123/x123-add-qt-wrap-xygrib 

    use wrapQtAppsHook in xygrib
    @Mic92
    Mic92 authored Jan 15, 2020
    Copy the full SHA
    50b2554 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/misc/xygrib/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/misc/xygrib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :
{ stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :

stdenv.mkDerivation rec {
version = "1.2.6.1";
@@ -11,13 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia";
};

nativeBuildInputs = [ cmake qttools ];
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ];

postInstall = ''
mkdir $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/XyGrib
wrapQtApp $out/XyGrib/XyGrib
mkdir -p $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
'';

meta = with stdenv.lib; {