diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-27 03:06:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 03:06:23 +0100 |
| commit | fffe30c22a0996264756be8cc3a76d4edb8ca41c (patch) | |
| tree | 430bcac328ea7cba876107620ce33b16e7702a8c /pkgs | |
| parent | 686b2a2ac8d2fc46e22530880729342c338bf8d9 (diff) | |
| parent | 29c5b32632f6f290eb6eb3637a85f1b4df8b510b (diff) | |
Merge pull request #96609 from sikmir/lsd2dsl
lsd2dsl: 0.5.1 -> 0.5.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/lsd2dsl/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 335279c7084ad..b30d652584f52 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8"; + sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi"; }; nativeBuildInputs = [ cmake ]; @@ -19,8 +19,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; installPhase = '' - install -Dm755 console/lsd2dsl $out/bin/lsd2dsl - install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin '' + lib.optionalString stdenv.isDarwin '' wrapQtApp $out/bin/lsd2dsl wrapQtApp $out/bin/lsd2dsl-qtgui diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f224789667c2e..1ea78c5d10455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22286,7 +22286,7 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; |