diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
| commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
| tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/applications/misc/xkblayout-state/default.nix | |
| parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
| parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
| download | nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip | |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/applications/misc/xkblayout-state/default.nix')
| -rw-r--r-- | pkgs/applications/misc/xkblayout-state/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 4ff838db653..69b98bc6f44 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "xkblayout-state-${version}"; + name = "${pname}-${version}"; + pname = "xkblayout-state"; version = "1b"; src = fetchurl { - url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/nonpop/${pname}/archive/v${version}.tar.gz"; sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx"; }; |