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

Commits on Sep 1, 2019

  1. nomace: use Qt mkDerivation

    @B4dM4n @worldofpeace
    B4dM4n authored and worldofpeace committed Sep 1, 2019
    Copy the full SHA
    fee7401 View commit details

  2. nomacs: enable translations

    @B4dM4n @worldofpeace
    B4dM4n authored and worldofpeace committed Sep 1, 2019
    Copy the full SHA
    543b904 View commit details

  3. Merge pull request #67767 from B4dM4n/nomacs-wrap-qt 

    nomacs: build using Qt mkDerivation (+ translations)
    @worldofpeace
    worldofpeace authored Sep 1, 2019
    Copy the full SHA
    b797fbc View commit details
Showing with 4 additions and 6 deletions.
  1. +4 −6 pkgs/applications/graphics/nomacs/default.nix
10 changes: 4 additions & 6 deletions pkgs/applications/graphics/nomacs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ stdenv
, mkDerivation
, fetchFromGitHub
, cmake
, pkgconfig
, wrapGAppsHook
, gsettings-desktop-schemas

, qtbase
, qttools
@@ -38,8 +37,7 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [cmake
pkgconfig
wrapGAppsHook];
pkgconfig];

buildInputs = [qtbase
qttools
@@ -48,13 +46,13 @@ stdenv.mkDerivation rec {
opencv
libraw
libtiff
quazip
gsettings-desktop-schemas];
quazip];

cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON"
"-DENABLE_TRANSLATIONS=ON"
"-DUSE_SYSTEM_QUAZIP=ON"];

meta = with stdenv.lib; {