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

Commits on Jun 26, 2019

  1. Copy the full SHA
    356a347 View commit details
  2. Merge pull request #63797 from romildo/upd.deepin.deepin-calculator

    deepin.deepin-calculator: init at 1.0.11
    worldofpeace authored Jun 26, 2019
    Copy the full SHA
    7c5a514 View commit details
Showing with 50 additions and 0 deletions.
  1. +49 −0 pkgs/desktops/deepin/deepin-calculator/default.nix
  2. +1 −0 pkgs/desktops/deepin/default.nix
49 changes: 49 additions & 0 deletions pkgs/desktops/deepin/deepin-calculator/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,
dtkwidget, deepin }:

stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-calculator";
version = "1.0.11";

src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq";
};

nativeBuildInputs = [
qmake
pkgconfig
qttools
deepin.setupHook
];

buildInputs = [
dtkcore
dtkwidget
qtsvg
];

postPatch = ''
searchHardCodedPaths # debugging
patchShebangs translate_generation.sh
fixPath $out /usr deepin-calculator.pro
substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator"
'';

postFixup = ''
searchHardCodedPaths $out # debugging
'';

passthru.updateScript = deepin.updateScript { inherit name; };

meta = with stdenv.lib; {
description = "Easy to use calculator for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/deepin-calculator;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}
1 change: 1 addition & 0 deletions pkgs/desktops/deepin/default.nix
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ let
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-anything = callPackage ./deepin-anything { };
deepin-calculator = callPackage ./deepin-calculator { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };