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

Commits on Jun 26, 2019

  1. deepin.dtkcore: explicitly set DTK_VERSION 

    The build system fails to detect the version to build, defaulting to
the minimum one. To circunvent that it has to be explicitly set.
    @romildo
    romildo committed Jun 26, 2019
    Copy the full SHA
    27170f9 View commit details

  2. Merge pull request #63795 from romildo/upd.deepin.dtkcore 

    deepin.dtkcore: explicitly set DTK_VERSION
    @worldofpeace
    worldofpeace authored Jun 26, 2019
    Copy the full SHA
    648ca9b View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/desktops/deepin/dtkcore/default.nix
5 changes: 4 additions & 1 deletion pkgs/desktops/deepin/dtkcore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
'';

qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ];
qmakeFlags = [
"DTK_VERSION=${version}"
"MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs"
];

postFixup = ''
chmod +x $out/lib/dtk2/*.py