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

Commits on Jan 30, 2020

  1. gpxlab: enable on darwin

    @sikmir
    sikmir committed Jan 30, 2020
    Copy the full SHA
    410a803 View commit details

Commits on Jan 31, 2020

  1. Merge pull request #78916 from sikmir/gpxlab 

    gpxlab: enable on darwin
    @veprbl
    veprbl authored Jan 31, 2020
    Copy the full SHA
    f566c68 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/applications/misc/gpxlab/default.nix
10 changes: 8 additions & 2 deletions pkgs/applications/misc/gpxlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }:
{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }:

mkDerivation rec {
pname = "gpxlab";
@@ -18,6 +18,12 @@ mkDerivation rec {
lrelease GPXLab/locale/*.ts
'';

postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv GPXLab/GPXLab.app $out/Applications
wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab
'';

enableParallelBuilding = true;

meta = with lib; {
@@ -29,6 +35,6 @@ mkDerivation rec {
'';
license = licenses.gpl3;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
};
}